Linux 2.6.29.6
Subsystems (27)
****NOTE****
This is the last release of the 2.6.29 kernel series. All users are strongly suggested to move to the 2.6.30 release series at this time.
************
I'm announcing the release of the 2.6.29.6 kernel. All users of the 2.6.29 kernel series are very strongly encouraged to upgrade.
I'll also be replying to this message with a copy of the patch between 2.6.29.5 and 2.6.29.6
The updated 2.6.29.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.29.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.29.y.git;a=summarythanks,
greg k-h
------------
Makefile | 2 arch/x86/kernel/cpu/amd.c | 4 arch/x86/kernel/reboot.c | 9 ++ arch/x86/kernel/setup.c | 15 --- drivers/block/floppy.c | 8 + drivers/char/moxa.c | 7 + drivers/char/mxser.c | 2 drivers/char/pcmcia/cm4000_cs.c | 3 drivers/char/vt_ioctl.c | 3 drivers/firmware/memmap.c | 16 ++- drivers/infiniband/hw/mlx4/qp.c | 4 drivers/input/keyboard/atkbd.c | 169 ++++++++++++++++++++++----------------- drivers/isdn/hisax/hfc_pci.c | 41 ++++++--- drivers/isdn/hisax/hisax.h | 2 drivers/md/dm-mpath.c | 11 ++ drivers/md/dm.c | 4 drivers/md/raid5.c | 1 drivers/net/bonding/bond_sysfs.c | 1 drivers/net/r8169.c | 11 +- drivers/parport/parport_pc.c | 34 ++++++- drivers/parport/parport_serial.c | 30 +++++- drivers/pci/pci.c | 7 - drivers/pci/pcie/aspm.c | 4 drivers/scsi/qla2xxx/qla_dbg.c | 2 drivers/serial/8250.c | 15 +++ drivers/usb/class/usbtmc.c | 6 + drivers/video/atmel_lcdfb.c | 10 -- fs/fs-writeback.c | 2 fs/jbd/commit.c | 6 - include/linux/firmware-map.h | 12 -- include/linux/mlx4/qp.h | 1 kernel/acct.c | 6 - lib/Kconfig.debug | 2 mm/page_alloc.c | 6 - net/mac80211/rc80211_minstrel.c | 2 sound/core/seq/seq_midi_event.c | 8 - sound/pci/ca0106/ca0106_mixer.c | 6 + 37 files changed, 311 insertions(+), 161 deletions(-)
Alan Cox (1):
8250: Fix oops from setserial
Andreas Herrmann (1):
x86: Set cpu_llc_id on AMD CPUs
Andrew Vasquez (1):
qla2xxx: Correct (again) overflow during dump-processing on large-memory ISP23xx parts.
Bob Copeland (1):
mac80211: fix minstrel single-rate memory corruption
Chuck Ebbert (1):
atkbd: add forced release quirks for four more keyboard models
Clemens Ladisch (1):
sound: seq_midi_event: fix decoding of (N)RPN events
Dan Williams (1):
md/raid5: add missing call to schedule() after prepare_to_wait()
Dimitri Sivanich (1):
mm: fix handling of pagesets for downed cpus
Dirk Eibach (1):
char: moxa, prevent opening unavailable ports
Eric Dumazet (1):
r8169: fix crash when large packets are received
FUJITA Tomonori (1):
parport_pc: set properly the dma_mask for parport_pc device
Greg Kroah-Hartman (2):
USB: usbtmc: fix switch statment
Linux 2.6.29.6
Jack Morgenstein (1):
IB/mlx4: Add strong ordering to local inval and fast reg work requests
Jan Kara (1):
jbd: fix race in buffer processing in commit code
Jean Delvare (1):
x86: Add quirk for reboot stalls on a Dell Optiplex 360
Jens Rottmann (1):
parport_pc: after superio probing restore original register values
Jiri Slaby (2):
vt_ioctl: fix lock imbalance
pcmcia/cm4000: fix lock imbalance
Karsten Keil (1):
ISDN: Fix DMA alloc for hfcpci
Mikulas Patocka (2):
dm mpath: validate table argument count dm mpath: validate hw_handler argument count
Milan Broz (1):
dm: sysfs skip output when device is being destroyed
Nick Piggin (1):
fs: remove incorrect I_NEW warnings
Nicolas Ferre (1):
atmel_lcdfb: correct fifo size for some products
Peter Botha (1):
char: mxser, fix ISA board lookup
Peter Zijlstra (1):
lockdep: Select frame pointers on x86
Philippe De Muyter (1):
parport: netmos 9845 & 9855 1P4S fixes
Rafael J. Wysocki (2):
PCI PM: Fix handling of devices without PM support by pci_target_state() PCI PM: Follow PCI_PM_CTRL_NO_SOFT_RESET during transitions from D3
Renaud Lottiaux (1):
bsdacct: fix access to invalid filp in acct_on()
Scott James Remnant (1):
floppy: provide a PNP device table in the module.
Shaohua Li (1):
PCI: disable ASPM on VIA root-port-under-bridge configurations
Stephen Hemminger (1):
bonding: fix multiple module load problem
Takashi Iwai (1):
ALSA: ca0106 - Add missing registrations of vmaster controls
Yinghai Lu (2):
firmware_map: fix hang with x86/32bit
x86: handle initrd that extends into unusable memory
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 29 -EXTRAVERSION = .5 +EXTRAVERSION = .6 NAME = Temporary Tasmanian Devil # *DOCUMENTATION*
arch/x86/kernel/cpu/amd.c +3 -1
@@ -207,13 +207,15 @@ static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c) {#ifdef CONFIG_X86_HT unsigned bits; +int cpu =smp_processor_id (); bits = c->x86_coreid_bits; -/* Low order bits define the core id (index of core in socket) */ c->cpu_core_id = c->initial_apicid & ((1 << bits)-1 );/* Convert the initial APIC ID into the socket ID */ c->phys_proc_id = c->initial_apicid >> bits; +/* use socket ID also for last level cache */ +per_cpu (cpu_llc_id, cpu) = c->phys_proc_id;#endif }
arch/x86/kernel/reboot.c +9 -0
@@ -193,6 +193,15 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { DMI_MATCH(DMI_BOARD_NAME, "0KP561"), }, }, + { /* Handle problems with rebooting on Dell Optiplex 360 with 0T656F */ + .callback = set_bios_reboot, + .ident = "Dell OptiPlex 360", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc." ), +DMI_MATCH (DMI_PRODUCT_NAME ,"OptiPlex 360" ), + DMI_MATCH(DMI_BOARD_NAME, "0T656F"), + }, + }, { /* Handle problems with rebooting on Dell 2400's */ .callback = set_bios_reboot, .ident = "Dell PowerEdge 2400",
arch/x86/kernel/setup.c +3 -12
@@ -255,15 +255,13 @@ static inline void copy_edd(void)#ifdef CONFIG_BLK_DEV_INITRD -#ifdef CONFIG_X86_32 -#define MAX_MAP_CHUNK (NR_FIX_BTMAPS << PAGE_SHIFT)static void __init relocate_initrd (void ) {u64 ramdisk_image = boot_params.hdr.ramdisk_image;u64 ramdisk_size = boot_params.hdr.ramdisk_size; - u64 end_of_lowmem = max_low_pfn << PAGE_SHIFT; +u64 end_of_lowmem = max_low_pfn_mapped <<PAGE_SHIFT ;u64 ramdisk_here;unsigned long slop, clen, mapaddr;char *p, *q;
@@ -319,14 +317,13 @@ static void __init relocate_initrd(void) ramdisk_image, ramdisk_image + ramdisk_size -1 , ramdisk_here, ramdisk_here + ramdisk_size - 1); } -#endif static void __init reserve_initrd (void ) {u64 ramdisk_image = boot_params.hdr.ramdisk_image;u64 ramdisk_size = boot_params.hdr.ramdisk_size;u64 ramdisk_end = ramdisk_image + ramdisk_size; -u64 end_of_lowmem = max_low_pfn <<PAGE_SHIFT ; +u64 end_of_lowmem = max_low_pfn_mapped <<PAGE_SHIFT ;if (!boot_params.hdr.type_of_loader || !ramdisk_image || !ramdisk_size)
@@ -356,14 +353,8 @@ static void __init reserve_initrd(void) return; } -#ifdef CONFIG_X86_32 relocate_initrd (); -#else -printk (KERN_ERR "initrd extends beyond end of memory " -"(0x%08llx > 0x%08llx)\ndisabling initrd\n" , - ramdisk_end, end_of_lowmem); - initrd_start =0 ; -#endif +free_early (ramdisk_image, ramdisk_end); }#else
drivers/block/floppy.c +8 -0
@@ -177,6 +177,7 @@ static int print_unex = 1;#include <linux/interrupt.h> #include <linux/init.h> #include <linux/platform_device.h> +#include <linux/mod_devicetable.h> #include <linux/buffer_head.h> /* for invalidate_buffers() */ #include <linux/mutex.h>
@@ -4598,6 +4599,13 @@ MODULE_AUTHOR("Alain L. Knaff");MODULE_SUPPORTED_DEVICE ("fd" );MODULE_LICENSE ("GPL" ); +/* This doesn't actually get used other than for module information */ +static const struct pnp_device_id floppy_pnpids[] = { + {"PNP0700" ,0 }, + { } +}; +MODULE_DEVICE_TABLE (pnp, floppy_pnpids); +#else __setup ("floppy=" , floppy_setup);
drivers/char/moxa.c +6 -1
@@ -1184,6 +1184,11 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)return -ENODEV ; } +if (port %MAX_PORTS_PER_BOARD >= brd->numPorts) { + retval = -ENODEV ; + goto out_unlock; + } + ch = &brd->ports[port %MAX_PORTS_PER_BOARD ]; ch->port.count++; tty->driver_data = ch;
@@ -1208,8 +1213,8 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)moxa_close_port (tty); }else ch->port.flags |=ASYNC_NORMAL_ACTIVE ; +out_unlock:mutex_unlock (&moxa_openlock); -return retval; }
drivers/char/mxser.c +1 -1
@@ -2712,7 +2712,7 @@ static int __init mxser_module_init(void)continue ; brd = &mxser_boards[m]; - retval =mxser_get_ISA_conf (!ioaddr[b], brd); + retval =mxser_get_ISA_conf (ioaddr[b], brd);if (retval <=0 ) { brd->info =NULL ;continue ;
drivers/char/pcmcia/cm4000_cs.c +2 -1
@@ -1575,7 +1575,8 @@ static long cmm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)clear_bit (LOCK_IO , &dev->flags);wake_up_interruptible (&dev->ioq); -return 0 ; + rc =0 ; +break ;case CM_IOCSPTS : {struct ptsreq krnptsreq;
drivers/char/vt_ioctl.c +2 -1
@@ -396,7 +396,8 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, kbd = kbd_table + console;switch (cmd) {case TIOCLINUX : -return tioclinux (tty, arg); + ret =tioclinux (tty, arg); +break ;case KIOCSOUND :if (!perm) goto eperm;
drivers/firmware/memmap.c +9 -7
@@ -31,8 +31,12 @@* information is necessary as for the resource tree. */ struct firmware_map_entry { -resource_size_t start;/* start of the memory range */ -resource_size_t end;/* end of the memory range (incl.) */ +/* +* start and end must be u64 rather than resource_size_t, because e820 +* resources can lie at addresses above 4G. +*/ +u64 start;/* start of the memory range */ +u64 end;/* end of the memory range (incl.) */ const char *type;/* type of the memory range */ struct list_head list;/* entry for the linked list */ struct kobject kobj;/* kobject for each entry */
@@ -101,7 +105,7 @@ static LIST_HEAD(map_entries);* Common implementation of firmware_map_add() and firmware_map_add_early() * which expects a pre-allocated struct firmware_map_entry. **/ -static int firmware_map_add_entry (resource_size_t start,resource_size_t end, +static int firmware_map_add_entry (u64 start,u64 end,const char *type,struct firmware_map_entry *entry) {
@@ -132,8 +136,7 @@ static int firmware_map_add_entry(resource_size_t start, resource_size_t end,* * Returns 0 on success, or -ENOMEM if no memory could be allocated. **/ -int firmware_map_add (resource_size_t start,resource_size_t end, -const char *type) +int firmware_map_add (u64 start,u64 end,const char *type) {struct firmware_map_entry *entry;
@@ -157,8 +160,7 @@ int firmware_map_add(resource_size_t start, resource_size_t end,* * Returns 0 on success, or -ENOMEM if no memory could be allocated. **/ -int __init firmware_map_add_early (resource_size_t start,resource_size_t end, -const char *type) +int __init firmware_map_add_early (u64 start,u64 end,const char *type) {struct firmware_map_entry *entry;
drivers/infiniband/hw/mlx4/qp.c +4 -0
@@ -1585,12 +1585,16 @@ int mlx4_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,break ;case IB_WR_LOCAL_INV : + ctrl->srcrb_flags |= +cpu_to_be32 (MLX4_WQE_CTRL_STRONG_ORDER );set_local_inv_seg (wqe, wr->ex.invalidate_rkey); wqe +=sizeof (struct mlx4_wqe_local_inval_seg ); size +=sizeof (struct mlx4_wqe_local_inval_seg ) /16 ;break ;case IB_WR_FAST_REG_MR : + ctrl->srcrb_flags |= +cpu_to_be32 (MLX4_WQE_CTRL_STRONG_ORDER );set_fmr_seg (wqe, wr); wqe +=sizeof (struct mlx4_wqe_fmr_seg ); size +=sizeof (struct mlx4_wqe_fmr_seg ) /16 ;
drivers/input/keyboard/atkbd.c +96 -73
254 lines not on this page · raw message
drivers/isdn/hisax/hfc_pci.c +30 -11
68 lines not on this page · raw message
drivers/isdn/hisax/hisax.h +1 -1
@@ -694,7 +694,7 @@ struct hfcPCI_hw {int nt_timer;struct pci_dev *dev;unsigned char *pci_io;/* start of PCI IO memory */ -void *share_start;/* shared memory for Fifos start */ +dma_addr_t dma;/* dma handle for Fifos */ void *fifos;/* FIFO memory */ int last_bfifo_cnt[2 ];/* marker saving last b-fifo frame count */ struct timer_list timer;
drivers/md/dm-mpath.c +11 -0
@@ -554,6 +554,12 @@ static int parse_path_selector(struct arg_set *as, struct priority_group *pg,return -EINVAL ; } +if (ps_argc > as->argc) { +dm_put_path_selector (pst); + ti->error ="not enough arguments for path selector" ; +return -EINVAL ; + } + r = pst->create (&pg->ps, ps_argc, as->argv);if (r) {dm_put_path_selector (pst);
@@ -700,6 +706,11 @@ static int parse_hw_handler(struct arg_set *as, struct multipath *m)if (!hw_argc)return 0 ; +if (hw_argc > as->argc) { + ti->error ="not enough arguments for hardware handler" ; +return -EINVAL ; + } + m->hw_handler_name =kstrdup (shift (as),GFP_KERNEL );request_module ("scsi_dh_%s" , m->hw_handler_name);if (scsi_dh_handler_exist (m->hw_handler_name) ==0 ) {
drivers/md/dm.c +4 -0
@@ -1728,6 +1728,10 @@ struct mapped_device *dm_get_from_kobject(struct kobject *kobj)if (&md->kobj != kobj)return NULL ; +if (test_bit (DMF_FREEING , &md->flags) || +test_bit (DMF_DELETING , &md->flags)) +return NULL ; +dm_get (md);return md; }
drivers/md/raid5.c +1 -0
@@ -3465,6 +3465,7 @@ static int make_request(struct request_queue *q, struct bio * bi)spin_unlock_irq (&conf->device_lock);if (must_retry) {release_stripe (sh); +schedule (); goto retry; } }
drivers/net/bonding/bond_sysfs.c +1 -0
@@ -1538,6 +1538,7 @@ int bond_create_sysfs(void)printk (KERN_ERR "network device named %s already exists in sysfs" , class_attr_bonding_masters.attr.name); + ret =0 ; }return ret;
drivers/net/r8169.c +5 -6
@@ -66,7 +66,6 @@ static const int multicast_filter_limit = 32;#define RX_DMA_BURST 6/* Maximum PCI burst, '6' is 1024 */ #define TX_DMA_BURST 6/* Maximum PCI burst, '6' is 1024 */ #define EarlyTxThld 0x3F/* 0x3F means NO early transmit */ -#define RxPacketMaxSize 0x3FE8/* 16K - 1 - ETH_HLEN - VLAN - CRC... */ #define SafeMtu 0x1c20/* ... actually life sucks beyond ~7k */ #define InterFrameGap 0x03/* 3 means InterFrameGap = the shortest one */
@@ -2357,10 +2356,10 @@ static u16 rtl_rw_cpluscmd(void __iomem *ioaddr)return cmd; } -static void rtl_set_rx_max_size (void __iomem *ioaddr) +static void rtl_set_rx_max_size (void __iomem *ioaddr,unsigned int rx_buf_sz) {/* Low hurts. Let's disable the filtering. */ -RTL_W16 (RxMaxSize,16383 ); +RTL_W16 (RxMaxSize, rx_buf_sz); }static void rtl8169_set_magic_reg (void __iomem *ioaddr,unsigned mac_version)
@@ -2407,7 +2406,7 @@ static void rtl_hw_start_8169(struct net_device *dev)RTL_W8 (EarlyTxThres, EarlyTxThld); -rtl_set_rx_max_size (ioaddr); +rtl_set_rx_max_size (ioaddr, tp->rx_buf_sz); if ((tp->mac_version == RTL_GIGA_MAC_VER_01) || (tp->mac_version == RTL_GIGA_MAC_VER_02) ||
@@ -2668,7 +2667,7 @@ static void rtl_hw_start_8168(struct net_device *dev)RTL_W8 (EarlyTxThres, EarlyTxThld); -rtl_set_rx_max_size (ioaddr); +rtl_set_rx_max_size (ioaddr, tp->rx_buf_sz); tp->cp_cmd |=RTL_R16 (CPlusCmd) | PktCntrDisable |INTT_1 ;
@@ -2846,7 +2845,7 @@ static void rtl_hw_start_8101(struct net_device *dev)RTL_W8 (EarlyTxThres, EarlyTxThld); -rtl_set_rx_max_size (ioaddr); +rtl_set_rx_max_size (ioaddr, tp->rx_buf_sz); tp->cp_cmd |=rtl_rw_cpluscmd (ioaddr) | PCIMulRW;
drivers/parport/parport_pc.c +28 -6
@@ -1413,11 +1413,13 @@ static void __devinit decode_smsc(int efer, int key, int devid, int devrev)static void __devinit winbond_check (int io,int key) { -int devid,devrev,oldid,x_devid,x_devrev,x_oldid; +int origval, devid, devrev, oldid, x_devid, x_devrev, x_oldid;if (!request_region (io,3 , __func__))return ; + origval =inb (io);/* Save original value */ +/* First probe without key */ outb (0x20 ,io); x_devid=inb (io+1 );
@@ -1437,6 +1439,8 @@ static void __devinit winbond_check(int io, int key) oldid=inb (io+1 );outb (0xaa ,io);/* Magic Seal */ +outb (origval, io);/* in case we poked some entirely different hardware */ +if ((x_devid == devid) && (x_devrev == devrev) && (x_oldid == oldid)) goto out;/* protection against false positives */
@@ -1447,11 +1451,15 @@ out:static void __devinit winbond_check2 (int io,int key) { -int devid,devrev,oldid,x_devid,x_devrev,x_oldid; +int origval[3 ], devid, devrev, oldid, x_devid, x_devrev, x_oldid;if (!request_region (io,3 , __func__))return ; + origval[0 ] =inb (io);/* Save original values */ + origval[1 ] =inb (io +1 ); + origval[2 ] =inb (io +2 ); +/* First probe without the key */ outb (0x20 ,io+2 ); x_devid=inb (io+2 );
@@ -1470,6 +1478,10 @@ static void __devinit winbond_check2(int io,int key) oldid=inb (io+2 );outb (0xaa ,io);/* Magic Seal */ +outb (origval[0 ], io);/* in case we poked some entirely different hardware */ +outb (origval[1 ], io +1 ); +outb (origval[2 ], io +2 ); +if ((x_devid == devid) && (x_devrev == devrev) && (x_oldid == oldid)) goto out;/* protection against false positives */
@@ -1480,11 +1492,13 @@ out:static void __devinit smsc_check (int io,int key) { -int id,rev,oldid,oldrev,x_id,x_rev,x_oldid,x_oldrev; +int origval, id, rev, oldid, oldrev, x_id, x_rev, x_oldid, x_oldrev;if (!request_region (io,3 , __func__))return ; + origval =inb (io);/* Save original value */ +/* First probe without the key */ outb (0x0d ,io); x_oldid=inb (io+1 );
@@ -1508,6 +1522,8 @@ static void __devinit smsc_check(int io, int key) rev=inb (io+1 );outb (0xaa ,io);/* Magic Seal */ +outb (origval, io);/* in case we poked some entirely different hardware */ +if ((x_id == id) && (x_oldrev == oldrev) && (x_oldid == oldid) && (x_rev == rev)) goto out;/* protection against false positives */
@@ -1544,11 +1560,12 @@ static void __devinit detect_and_report_smsc (void)static void __devinit detect_and_report_it87 (void ) {u16 dev; -u8 r; +u8 origval, r;if (verbose_probing)printk (KERN_DEBUG "IT8705 Super-IO detection, now testing port 2E ...\n" ); -if (!request_region (0x2e ,1 , __func__)) +if (!request_region (0x2e ,2 , __func__))return ; + origval =inb (0x2e );/* Save original value */ outb (0x87 ,0x2e );outb (0x01 ,0x2e );outb (0x55 ,0x2e );
@@ -1568,8 +1585,10 @@ static void __devinit detect_and_report_it87(void)outb (r |8 ,0x2F );outb (0x02 ,0x2E );/* Lock */ outb(0x02, 0x2F); + }else { +outb (origval,0x2e );/* Oops, sorry to disturb */ } -release_region (0x2e ,1 ); +release_region (0x2e ,2 ); }#endif /* CONFIG_PARPORT_PC_SUPERIO */
@@ -2192,6 +2211,9 @@ struct parport *parport_pc_probe_port (unsigned long int base,if (IS_ERR (pdev))return NULL ; dev = &pdev->dev; + + dev->coherent_dma_mask =DMA_BIT_MASK (24 ); + dev->dma_mask = &dev->coherent_dma_mask; } ops =kmalloc (sizeof (struct parport_operations ),GFP_KERNEL );
drivers/parport/parport_serial.c +25 -5
@@ -30,6 +30,7 @@ enum parport_pc_pci_cards { titan_210l, netmos_9xx5_combo, netmos_9855, + netmos_9855_2p, avlab_1s1p, avlab_1s2p, avlab_2s1p,
@@ -62,7 +63,7 @@ struct parport_pc_pci { struct parport_pc_pci *card, int failed); }; -static int __devinit netmos_parallel_init (struct pci_dev *dev,struct parport_pc_pci *card,int autoirq,int autodma) +static int __devinit netmos_parallel_init (struct pci_dev *dev,struct parport_pc_pci *par,int autoirq,int autodma) {/* the rule described below doesn't hold for this device */ if (dev->device == PCI_DEVICE_ID_NETMOS_9835 &&
@@ -74,9 +75,17 @@ static int __devinit netmos_parallel_init(struct pci_dev *dev, struct parport_pc* and serial ports. The form is 0x00PS, where <P> is the number of * parallel ports and <S> is the number of serial ports. */ - card->numports = (dev->subsystem_device &0xf0 ) >>4 ; -if (card->numports >ARRAY_SIZE (card->addr)) - card->numports =ARRAY_SIZE (card->addr); + par->numports = (dev->subsystem_device &0xf0 ) >>4 ; +if (par->numports >ARRAY_SIZE (par->addr)) + par->numports =ARRAY_SIZE (par->addr); +/* +* This function is currently only called for cards with up to +* one parallel port. +* Parallel port BAR is either before or after serial ports BARS; +* hence, lo should be either 0 or equal to the number of serial ports. +*/ +if (par->addr[0 ].lo !=0 ) + par->addr[0 ].lo = dev->subsystem_device &0xf ;return 0 ; }
@@ -84,7 +93,8 @@ static struct parport_pc_pci cards[] __devinitdata = { /* titan_110l */ { 1, { { 3, -1 }, } }, /* titan_210l */ { 1, { { 3, -1 }, } }, /* netmos_9xx5_combo */ { 1, { { 2, -1 }, }, netmos_parallel_init }, - /* netmos_9855 */ { 1, { { 2, -1 }, }, netmos_parallel_init }, + /* netmos_9855 */ { 1, { { 0, -1 }, }, netmos_parallel_init }, + /* netmos_9855_2p */ { 2, { { 0, -1 }, { 2, -1 }, } }, /* avlab_1s1p */ { 1, { { 1, 2}, } }, /* avlab_1s2p */ { 2, { { 1, 2}, { 3, 4 },} }, /* avlab_2s1p */ { 1, { { 2, 3}, } },
@@ -110,6 +120,10 @@ static struct pci_device_id parport_serial_pci_tbl[] = { {PCI_VENDOR_ID_NETMOS ,PCI_DEVICE_ID_NETMOS_9845 , PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9xx5_combo }, { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855, + 0x1000, 0x0020, 0, 0, netmos_9855_2p }, + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855, + 0x1000, 0x0022, 0, 0, netmos_9855_2p }, + { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855, PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9855 },/* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/ { PCI_VENDOR_ID_AFAVLAB, 0x2110,
@@ -192,6 +206,12 @@ static struct pciserial_board pci_parport_serial_boards[] __devinitdata = { .uart_offset = 8, }, [netmos_9855] = { + .flags = FL_BASE2 | FL_BASE_BARS, + .num_ports = 1, + .base_baud = 115200, + .uart_offset = 8, + }, + [netmos_9855_2p] = { .flags = FL_BASE4 | FL_BASE_BARS, .num_ports = 1, .base_baud = 115200,
drivers/pci/pci.c +4 -3
@@ -479,6 +479,8 @@ pci_raw_set_power_state(struct pci_dev *dev, pci_power_t state, bool wait) pmcsr &= ~PCI_PM_CTRL_STATE_MASK ; pmcsr |= state;break ; +case PCI_D3hot: +case PCI_D3cold:case PCI_UNKNOWN :/* Boot-up */ if ((pmcsr &PCI_PM_CTRL_STATE_MASK ) == PCI_D3hot && !(pmcsr &PCI_PM_CTRL_NO_SOFT_RESET )) {
@@ -1196,15 +1198,14 @@ pci_power_t pci_target_state(struct pci_dev *dev)default : target_state = state; } + }else if (!dev->pm_cap) { + target_state =PCI_D0 ; }else if (device_may_wakeup (&dev->dev)) {/* * Find the deepest state from which the device can generate * wake-up events, make it the target state and enable device * to generate PME#. */ -if (!dev->pm_cap) -return PCI_POWER_ERROR ; -if (dev->pme_support) {while (target_state && !(dev->pme_support & (1 << target_state)))
drivers/pci/pcie/aspm.c +4 -0
@@ -638,6 +638,10 @@ void pcie_aspm_init_link_state(struct pci_dev *pdev)if (pdev->pcie_type !=PCI_EXP_TYPE_ROOT_PORT && pdev->pcie_type !=PCI_EXP_TYPE_DOWNSTREAM )return ; +/* VIA has a strange chipset, root port is under a bridge */ +if (pdev->pcie_type ==PCI_EXP_TYPE_ROOT_PORT && + pdev->bus->self) +return ;down_read (&pci_bus_sem);if (list_empty (&pdev->subordinate->devices)) goto out;
drivers/scsi/qla2xxx/qla_dbg.c +1 -1
@@ -218,7 +218,7 @@ qla24xx_soft_reset(struct qla_hw_data *ha)static int qla2xxx_dump_ram (struct qla_hw_data *ha,uint32_t addr,uint16_t *ram, -uint16_t ram_words,void **nxt) +uint32_t ram_words,void **nxt) {int rval;uint32_t cnt, stat, timer, words, idx;
drivers/serial/8250.c +15 -0
@@ -137,6 +137,7 @@ struct uart_8250_port {unsigned char mcr;unsigned char mcr_mask;/* mask of user bits */ unsigned char mcr_force;/* mask of forced bits */ +unsigned char cur_iotype;/* Running I/O type */ /* * Some bits in registers are cleared on a read, so they must
@@ -471,6 +472,7 @@ static void io_serial_out(struct uart_port *p, int offset, int value)static void set_io_from_upio (struct uart_port *p) { +struct uart_8250_port *up = (struct uart_8250_port *)p;switch (p->iotype) {case UPIO_HUB6 : p->serial_in = hub6_serial_in;
@@ -509,6 +511,8 @@ static void set_io_from_upio(struct uart_port *p) p->serial_out = io_serial_out;break ; } +/* Remember loaded iotype */ + up->cur_iotype = p->iotype; } static void
@@ -1937,6 +1941,9 @@ static int serial8250_startup(struct uart_port *port) up->capabilities = uart_config[up->port.type].flags; up->mcr =0 ; +if (up->port.iotype != up->cur_iotype) +set_io_from_upio (port); +if (up->port.type ==PORT_16C950 ) {/* Wake up and initialize UART */ up->acr =0 ;
@@ -2563,6 +2570,9 @@ static void serial8250_config_port(struct uart_port *port, int flags)if (ret <0 ) probeflags &= ~PROBE_RSA ; +if (up->port.iotype != up->cur_iotype) +set_io_from_upio (port); +if (flags &UART_CONFIG_TYPE )autoconfig (up, probeflags);if (up->port.type !=PORT_UNKNOWN && flags &UART_CONFIG_IRQ )
@@ -2671,6 +2681,11 @@ serial8250_register_ports(struct uart_driver *drv, struct device *dev) {int i; +for (i =0 ; i < nr_uarts; i++) { +struct uart_8250_port *up = &serial8250_ports[i]; + up->cur_iotype =0xFF ; + } +serial8250_isa_init_ports ();for (i =0 ; i < nr_uarts; i++) {
drivers/usb/class/usbtmc.c +6 -0
@@ -927,21 +927,27 @@ static long usbtmc_ioctl(struct file *file, unsigned int cmd, unsigned long arg)switch (cmd) {case USBTMC_IOCTL_CLEAR_OUT_HALT : retval =usbtmc_ioctl_clear_out_halt (data); +break ;case USBTMC_IOCTL_CLEAR_IN_HALT : retval =usbtmc_ioctl_clear_in_halt (data); +break ;case USBTMC_IOCTL_INDICATOR_PULSE : retval =usbtmc_ioctl_indicator_pulse (data); +break ;case USBTMC_IOCTL_CLEAR : retval =usbtmc_ioctl_clear (data); +break ;case USBTMC_IOCTL_ABORT_BULK_OUT : retval =usbtmc_ioctl_abort_bulk_out (data); +break ;case USBTMC_IOCTL_ABORT_BULK_IN : retval =usbtmc_ioctl_abort_bulk_in (data); +break ; }mutex_unlock (&data->io_mutex);
drivers/video/atmel_lcdfb.c +2 -8
@@ -29,14 +29,8 @@/* configurable parameters */ #define ATMEL_LCDC_CVAL_DEFAULT 0xc8 -#define ATMEL_LCDC_DMA_BURST_LEN 8 - -#if defined(CONFIG_ARCH_AT91SAM9263 ) || defined(CONFIG_ARCH_AT91CAP9 ) || \ - defined(CONFIG_ARCH_AT91SAM9RL ) -#define ATMEL_LCDC_FIFO_SIZE 2048 -#else -#define ATMEL_LCDC_FIFO_SIZE 512 -#endif +#define ATMEL_LCDC_DMA_BURST_LEN 8/* words */ +#define ATMEL_LCDC_FIFO_SIZE 512/* words */ #if defined(CONFIG_ARCH_AT91 )#define ATMEL_LCDFB_FBINFO_DEFAULT (FBINFO_DEFAULT \
fs/fs-writeback.c +0 -2
@@ -274,7 +274,6 @@ __sync_single_inode(struct inode *inode, struct writeback_control *wbc)int ret;BUG_ON (inode->i_state &I_SYNC ); -WARN_ON (inode->i_state &I_NEW );/* Set I_SYNC, reset I_DIRTY */ dirty = inode->i_state &I_DIRTY ;
@@ -299,7 +298,6 @@ __sync_single_inode(struct inode *inode, struct writeback_control *wbc) }spin_lock (&inode_lock); -WARN_ON (inode->i_state &I_NEW ); inode->i_state &= ~I_SYNC ;if (!(inode->i_state &I_FREEING )) { if (!(inode->i_state & I_DIRTY) &&
fs/jbd/commit.c +4 -2
@@ -238,7 +238,7 @@ write_out_data:spin_lock (&journal->j_list_lock); }/* Someone already cleaned up the buffer? */ -if (!buffer_jbd (bh) +if (!buffer_jbd (bh) ||bh2jh (bh) != jh || jh->b_transaction != commit_transaction || jh->b_jlist != BJ_SyncData) {jbd_unlock_bh_state (bh);
@@ -466,7 +466,9 @@ void journal_commit_transaction(journal_t *journal)spin_lock (&journal->j_list_lock);continue ; } -if (buffer_jbd (bh) && jh->b_jlist == BJ_Locked) { +if (buffer_jbd (bh) &&bh2jh (bh) == jh && + jh->b_transaction == commit_transaction && + jh->b_jlist == BJ_Locked) {__journal_unfile_buffer (jh);jbd_unlock_bh_state (bh);journal_remove_journal_head (bh);
include/linux/firmware-map.h +4 -8
@@ -24,21 +24,17 @@*/ #ifdef CONFIG_FIRMWARE_MEMMAP -int firmware_map_add (resource_size_t start,resource_size_t end, -const char *type); -int firmware_map_add_early (resource_size_t start,resource_size_t end, -const char *type); +int firmware_map_add (u64 start,u64 end,const char *type); +int firmware_map_add_early (u64 start,u64 end,const char *type);#else /* CONFIG_FIRMWARE_MEMMAP */ -static inline int firmware_map_add (resource_size_t start,resource_size_t end, -const char *type) +static inline int firmware_map_add (u64 start,u64 end,const char *type) {return 0 ; } -static inline int firmware_map_add_early (resource_size_t start, -resource_size_t end,const char *type) +static inline int firmware_map_add_early (u64 start,u64 end,const char *type) {return 0 ; }
include/linux/mlx4/qp.h +1 -0
@@ -165,6 +165,7 @@ enum {MLX4_WQE_CTRL_IP_CSUM =1 <<4 ,MLX4_WQE_CTRL_TCP_UDP_CSUM =1 <<5 ,MLX4_WQE_CTRL_INS_VLAN =1 <<6 , + MLX4_WQE_CTRL_STRONG_ORDER = 1 << 7, }; struct mlx4_wqe_ctrl_seg {
kernel/acct.c +4 -2
@@ -215,6 +215,7 @@ static void acct_file_reopen(struct bsd_acct_struct *acct, struct file *file,static int acct_on (char *name) {struct file *file; +struct vfsmount *mnt;int error;struct pid_namespace *ns;struct bsd_acct_struct *acct =NULL ;
@@ -256,11 +257,12 @@ static int acct_on(char *name) acct =NULL ; } -mnt_pin (file->f_path.mnt); + mnt = file->f_path.mnt; +mnt_pin (mnt);acct_file_reopen (ns->bacct, file, ns);spin_unlock (&acct_lock); -mntput (file->f_path.mnt);/* it's pinned, now give up active reference */ +mntput (mnt);/* it's pinned, now give up active reference */ kfree (acct);return 0 ;
lib/Kconfig.debug +1 -1
@@ -402,7 +402,7 @@ config LOCKDEP bool depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT select STACKTRACE - select FRAME_POINTER if !X86 && !MIPS && !PPC + select FRAME_POINTER if !MIPS && !PPC select KALLSYMS select KALLSYMS_ALL
mm/page_alloc.c +4 -2
@@ -2804,7 +2804,7 @@ bad:if (dzone == zone)break ;kfree (zone_pcp (dzone, cpu)); -zone_pcp (dzone, cpu) =NULL ; +zone_pcp (dzone, cpu) = &boot_pageset[cpu]; }return -ENOMEM ; }
@@ -2819,7 +2819,7 @@ static inline void free_zone_pagesets(int cpu)/* Free per_cpu_pageset if it is slab allocated */ if (pset != &boot_pageset[cpu])kfree (pset); -zone_pcp (zone, cpu) =NULL ; +zone_pcp (zone, cpu) = &boot_pageset[cpu]; } }
@@ -4494,6 +4494,8 @@ int percpu_pagelist_fraction_sysctl_handler(ctl_table *table, int write,if (!write || (ret == -EINVAL ))return ret;for_each_zone (zone) { +if (!populated_zone (zone)) +continue ;for_each_online_cpu (cpu) {unsigned long high; high = zone->present_pages / percpu_pagelist_fraction;
net/mac80211/rc80211_minstrel.c +1 -1
@@ -216,7 +216,7 @@ minstrel_get_next_sample(struct minstrel_sta_info *mi)unsigned int sample_ndx; sample_ndx =SAMPLE_TBL (mi, mi->sample_idx, mi->sample_column); mi->sample_idx++; -if (mi->sample_idx > (mi->n_rates -2 )) { +if ((int ) mi->sample_idx > (mi->n_rates -2 )) { mi->sample_idx =0 ; mi->sample_column++;if (mi->sample_column >=SAMPLE_COLUMNS )
sound/core/seq/seq_midi_event.c +4 -4
@@ -504,10 +504,10 @@ static int extra_decode_xrpn(struct snd_midi_event *dev, unsigned char *buf,if (dev->nostat && count <12 )return -ENOMEM ; cmd =MIDI_CMD_CONTROL |(ev->data.control.channel &0x0f ); - bytes[0 ] = ev->data.control.param &0x007f ; - bytes[1 ] = (ev->data.control.param &0x3f80 ) >>7 ; - bytes[2 ] = ev->data.control.value &0x007f ; - bytes[3 ] = (ev->data.control.value &0x3f80 ) >>7 ; + bytes[0 ] = (ev->data.control.param &0x3f80 ) >>7 ; + bytes[1 ] = ev->data.control.param &0x007f ; + bytes[2 ] = (ev->data.control.value &0x3f80 ) >>7 ; + bytes[3 ] = ev->data.control.value &0x007f ;if (cmd != dev->lastcmd && !dev->nostat) {if (count <9 )return -ENOMEM ;
sound/pci/ca0106/ca0106_mixer.c +6 -0
@@ -841,6 +841,9 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu) snd_ca0106_master_db_scale);if (!vmaster)return -ENOMEM ; + err =snd_ctl_add (card, vmaster); +if (err <0 ) +return err;add_slaves (card, vmaster, slave_vols);if (emu->details->spi_dac ==1 ) {
@@ -848,6 +851,9 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu) NULL);if (!vmaster)return -ENOMEM ; + err =snd_ctl_add (card, vmaster); +if (err <0 ) +return err;add_slaves (card, vmaster, slave_sws); }return 0 ;