Linux 3.0.17
I'm announcing the release of the 3.0.17 kernel.
All users of the 3.0 kernel series must upgrade.
The updated 3.0.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.0.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/HOWTO | 4 - Documentation/development-process/5.Posting | 8 +- Documentation/usb/usbmon.txt | 14 +++-- MAINTAINERS | 2 Makefile | 2 arch/powerpc/include/asm/time.h | 2 arch/powerpc/kernel/irq.c | 15 ++--- arch/powerpc/kernel/time.c | 9 +++ arch/powerpc/platforms/pseries/hvCall_inst.c | 4 - arch/powerpc/platforms/pseries/lpar.c | 2 drivers/base/firmware_class.c | 14 ++--- drivers/infiniband/hw/qib/qib_iba6120.c | 4 + drivers/infiniband/hw/qib/qib_iba7220.c | 4 + drivers/infiniband/hw/qib/qib_iba7322.c | 6 +- drivers/net/bonding/bond_main.c | 9 ++- drivers/net/usb/asix.c | 6 +- drivers/net/wireless/rt2x00/rt2800usb.c | 2 drivers/net/wireless/wl12xx/boot.c | 14 +++++ drivers/net/wireless/wl12xx/cmd.c | 22 ++++++++ drivers/scsi/mpt2sas/mpt2sas_scsih.c | 1 drivers/tty/serial/atmel_serial.c | 5 + drivers/usb/class/cdc-acm.c | 16 +++++ drivers/usb/core/hcd.c | 5 - drivers/usb/core/quirks.c | 5 + drivers/usb/host/ehci-q.c | 2 drivers/usb/host/ohci-hcd.c | 15 ++--- drivers/usb/host/ohci-pci.c | 26 --------- drivers/usb/host/ohci.h | 1 drivers/usb/host/pci-quirks.c | 50 ++++++++---------- drivers/usb/host/uhci-q.c | 2 drivers/usb/host/whci/qset.c | 4 - drivers/usb/host/xhci-ring.c | 4 - drivers/usb/host/xhci.c | 4 - drivers/usb/host/xhci.h | 1 drivers/usb/misc/isight_firmware.c | 6 +- drivers/usb/musb/musb_core.c | 2 drivers/usb/serial/cp210x.c | 1 drivers/usb/serial/omninet.c | 2 drivers/usb/serial/option.c | 10 +++ drivers/usb/storage/usb.c | 1 drivers/video/offb.c | 52 ++++++++---------- fs/ext3/inode.c | 24 +++++++- fs/reiserfs/super.c | 27 +++++---- fs/udf/file.c | 6 +- fs/udf/inode.c | 21 ++++++- fs/xfs/linux-2.6/xfs_acl.c | 2 include/linux/usb.h | 1 include/linux/usb/ch9.h | 20 ++++++- kernel/cgroup.c | 6 +- kernel/cpu.c | 74 +++++++++++++++++++++++++++ net/ipv4/igmp.c | 2 tools/perf/util/trace-event-parse.c | 2 52 files changed, 364 insertions(+), 179 deletions(-)
Alan Stern (2):
USB: update documentation for usbmon
OHCI: final fix for NVIDIA problems (I hope)
Anton Blanchard (1):
powerpc/time: Handle wrapping of decrementer
Aurelien Jacobs (2):
asix: new device id
asix: fix infinite loop in rx_fixup()
Ben Hutchings (1):
igmp: Avoid zero delay when receiving odd mixture of IGMP queries
Benjamin Herrenschmidt (2):
offb: Fix setting of the pseudo-palette for >8bpp
offb: Fix bug in calculating requested vram size
Claudio Scordino (1):
atmel_serial: fix spinlock lockup in RS485 code
Clemens Ladisch (1):
usb: fix number of mapped SG DMA entries
Felipe Balbi (1):
usb: ch9: fix up MaxStreams helper
Felipe Contreras (1):
usb: musb: fix pm_runtime mismatch
Greg Kroah-Hartman (2):
USB: isight: fix kernel bug when loading firmware Linux 3.0.17
Hans de Goede (1):
xhci: Properly handle COMP_2ND_BW_ERR
Huajun Li (1):
usb: usb-storage doesn't support dynamic id currently, the patch disables the feature to fix an oops
Jan Kara (3):
reiserfs: Fix quota mount option parsing
ext3: Don't warn from writepage when readonly inode is spotted after error
udf: Fix deadlock when converting file from in-ICB one to normal one
Janne Snabb (1):
usb: option: add ZD Incorporated HSPA modem
Jeff Mahoney (1):
reiserfs: Force inode evictions before umount to avoid crash
Joe Perches (2):
MAINTAINERS: stable: Update address
Documentation: Update stable address
Johan Hovold (1):
USB: omninet: fix write_room
Julia Lawall (1):
drivers/usb/class/cdc-acm.c: clear dangling pointer
Larry Finger (1):
rt2800usb: Move ID out of unknown
Li Zefan (1):
cgroup: fix to allow mounting a hierarchy by name
Li Zhong (1):
powerpc: Fix unpaired probe_hcall_entry and probe_hcall_exit
Malte Schröder (1):
USB: Add USB-ID for Multiplex RC serial adapter to cp210x.c
Neil Horman (1):
firmware: Fix an oops on reading fw_priv->fw in sysfs loading file
Oliver Neukum (1):
USB: add quirk for another camera
Pontus Fuchs (2):
wl12xx: Validate FEM index from ini file and FW
wl12xx: Check buffer bound when processing nvs data
Ram Vepa (1):
IB/qib: Fix a possible data corruption when receiving packets
Srivatsa S. Bhat (1):
PM / Sleep: Fix race between CPU hotplug and freezer
Steven Rostedt (1):
perf: Fix parsing of __print_flags() in TP_printk()
Thilo-Alexander Ginkel (1):
usb: cdc-acm: Fix acm_tty_hangup() vs. acm_tty_close() race
VU Tuan Duc (1):
USB: option: add id for 3G dongle Model VT1000 of Viettel
Xi Wang (1):
xfs: fix acl count validation in xfs_acl_from_disk()
[email protected] (1):
SCSI: mpt2sas: Added missing mpt2sas_base_detach call from scsih_remove context
stephen hemminger (1):
bonding: fix error handling if slave is busy (v2)
Documentation/HOWTO +2 -2
@@ -275,8 +275,8 @@ versions. If no 2.6.x.y kernel is available, then the highest numbered 2.6.x kernel is the current stable kernel. -2.6.x.y are maintained by the "stable" team <[email protected]>, and are -released as needs dictate. The normal release period is approximately +2.6.x.y are maintained by the "stable" team <[email protected]>, and +are released as needs dictate. The normal release period is approximately two weeks, but it can be longer if there are no pressing problems. A security-related problem, instead, can cause a release to happen almost instantly.
Documentation/development-process/5.Posting +4 -4
@@ -271,10 +271,10 @@ copies should go to: the linux-kernel list. - If you are fixing a bug, think about whether the fix should go into the - next stable update. If so, [email protected] should get a copy of the - patch. Also add a "Cc: [email protected]" to the tags within the patch - itself; that will cause the stable team to get a notification when your - fix goes into the mainline. + next stable update. If so, [email protected] should get a copy of + the patch. Also add a "Cc: [email protected]" to the tags within + the patch itself; that will cause the stable team to get a notification + when your fix goes into the mainline. When selecting recipients for a patch, it is good to have an idea of who you think will eventually accept the patch and get it merged. While it
Documentation/usb/usbmon.txt +9 -5
@@ -47,10 +47,11 @@ This allows to filter away annoying devices that talk continuously. 2. Find which bus connects to the desired device -Run "cat /proc/bus/usb/devices", and find the T-line which corresponds to -the device. Usually you do it by looking for the vendor string. If you have -many similar devices, unplug one and compare two /proc/bus/usb/devices outputs. -The T-line will have a bus number. Example: +Run "cat /sys/kernel/debug/usb/devices", and find the T-line which corresponds +to the device. Usually you do it by looking for the vendor string. If you have +many similar devices, unplug one and compare the two +/sys/kernel/debug/usb/devices outputs. The T-line will have a bus number. +Example: T: Bus=03 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 D: Ver= 1.10 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs= 1
@@ -58,7 +59,10 @@ P: Vendor=0557 ProdID=2004 Rev= 1.00 S: Manufacturer=ATEN S: Product=UC100KM V2.00 -Bus=03 means it's bus 3. +"Bus=03" means it's bus 3. Alternatively, you can look at the output from +"lsusb" and get the bus number from the appropriate line. Example: + +Bus 003 Device 002: ID 0557:2004 ATEN UC100KM V2.00 3. Start 'cat'
MAINTAINERS +1 -1
@@ -6039,7 +6039,7 @@ F: arch/alpha/kernel/srm_env.c STABLE BRANCH M: Greg Kroah-Hartman <[email protected]> -L: [email protected] +L: [email protected] S: Maintained STAGING SUBSYSTEM
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 16 +SUBLEVEL = 17 EXTRAVERSION = NAME = Sneaky Weasel
arch/powerpc/include/asm/time.h +2 -0
@@ -219,5 +219,7 @@ DECLARE_PER_CPU(struct cpu_usage, cpu_usage_array);extern void secondary_cpu_time_init (void );extern void iSeries_time_init_early (void ); +extern void decrementer_check_overflow (void ); +#endif /* __KERNEL__ */ #endif /* __POWERPC_TIME_H */
arch/powerpc/kernel/irq.c +6 -9
@@ -170,16 +170,13 @@ notrace void arch_local_irq_restore(unsigned long en)*/ local_paca->hard_enabled = en; -#ifndef CONFIG_BOOKE -/* On server, re-trigger the decrementer if it went negative since -* some processors only trigger on edge transitions of the sign bit. -* -* BookE has a level sensitive decrementer (latches in TSR) so we -* don't need that +/* +* Trigger the decrementer if we have a pending event. Some processors +* only trigger on edge transitions of the sign bit. We might also +* have disabled interrupts long enough that the decrementer wrapped +* to positive. */ -if ((int )mfspr (SPRN_DEC ) <0 ) -mtspr (SPRN_DEC ,1 ); -#endif /* CONFIG_BOOKE */ +decrementer_check_overflow ();/* * Force the delivery of pending soft-disabled interrupts on PS3.
arch/powerpc/kernel/time.c +9 -0
@@ -889,6 +889,15 @@ static void __init clocksource_init(void) clock->name, clock->mult, clock->shift); } +void decrementer_check_overflow (void ) +{ +u64 now =get_tb_or_rtc (); +struct decrementer_clock *decrementer = &__get_cpu_var (decrementers); + +if (now >= decrementer->next_tb) +set_dec (1 ); +} +static int decrementer_set_next_event (unsigned long evt,struct clock_event_device *dev) {
arch/powerpc/platforms/pseries/hvCall_inst.c +1 -3
@@ -109,7 +109,7 @@ static void probe_hcall_entry(void *ignored, unsigned long opcode, unsigned longif (opcode >MAX_HCALL_OPCODE )return ; - h = &get_cpu_var (hcall_stats)[opcode /4 ]; + h = &__get_cpu_var (hcall_stats)[opcode /4 ]; h->tb_start =mftb (); h->purr_start =mfspr (SPRN_PURR ); }
@@ -126,8 +126,6 @@ static void probe_hcall_exit(void *ignored, unsigned long opcode, unsigned long h->num_calls++; h->tb_total +=mftb () - h->tb_start; h->purr_total +=mfspr (SPRN_PURR ) - h->purr_start; - -put_cpu_var (hcall_stats); }static int __init hcall_inst_init (void )
arch/powerpc/platforms/pseries/lpar.c +2 -0
@@ -745,6 +745,7 @@ void __trace_hcall_entry(unsigned long opcode, unsigned long *args) goto out; (*depth)++; +preempt_disable ();trace_hcall_entry (opcode, args); (*depth)--;
@@ -767,6 +768,7 @@ void __trace_hcall_exit(long opcode, unsigned long retval, (*depth)++;trace_hcall_exit (opcode, retval, retbuf); +preempt_enable (); (*depth)--; out:
drivers/base/firmware_class.c +7 -7
@@ -226,13 +226,13 @@ static ssize_t firmware_loading_store(struct device *dev,int loading =simple_strtol (buf,NULL ,10 );int i; +mutex_lock (&fw_lock); + +if (!fw_priv->fw) + goto out; +switch (loading) {case 1 : -mutex_lock (&fw_lock); -if (!fw_priv->fw) { -mutex_unlock (&fw_lock); -break ; - }firmware_free_data (fw_priv->fw);memset (fw_priv->fw,0 ,sizeof (struct firmware ));/* If the pages are not owned by 'struct firmware' */
@@ -243,7 +243,6 @@ static ssize_t firmware_loading_store(struct device *dev, fw_priv->page_array_size =0 ; fw_priv->nr_pages =0 ;set_bit (FW_STATUS_LOADING , &fw_priv->status); -mutex_unlock (&fw_lock);break ;case 0 :if (test_bit (FW_STATUS_LOADING , &fw_priv->status)) {
@@ -274,7 +273,8 @@ static ssize_t firmware_loading_store(struct device *dev,fw_load_abort (fw_priv);break ; } - +out: +mutex_unlock (&fw_lock);return count; }
drivers/infiniband/hw/qib/qib_iba6120.c +3 -1
@@ -2076,9 +2076,11 @@ static void qib_6120_config_ctxts(struct qib_devdata *dd)static void qib_update_6120_usrhead (struct qib_ctxtdata *rcd,u64 hd,u32 updegr,u32 egrhd,u32 npkts) { -qib_write_ureg (rcd->dd, ur_rcvhdrhead, hd, rcd->ctxt);if (updegr)qib_write_ureg (rcd->dd, ur_rcvegrindexhead, egrhd, rcd->ctxt); +mmiowb (); +qib_write_ureg (rcd->dd, ur_rcvhdrhead, hd, rcd->ctxt); +mmiowb (); }static u32 qib_6120_hdrqempty (struct qib_ctxtdata *rcd)
drivers/infiniband/hw/qib/qib_iba7220.c +3 -1
@@ -2704,9 +2704,11 @@ static int qib_7220_set_loopback(struct qib_pportdata *ppd, const char *what)static void qib_update_7220_usrhead (struct qib_ctxtdata *rcd,u64 hd,u32 updegr,u32 egrhd,u32 npkts) { -qib_write_ureg (rcd->dd, ur_rcvhdrhead, hd, rcd->ctxt);if (updegr)qib_write_ureg (rcd->dd, ur_rcvegrindexhead, egrhd, rcd->ctxt); +mmiowb (); +qib_write_ureg (rcd->dd, ur_rcvhdrhead, hd, rcd->ctxt); +mmiowb (); }static u32 qib_7220_hdrqempty (struct qib_ctxtdata *rcd)
drivers/infiniband/hw/qib/qib_iba7322.c +4 -2
@@ -4060,10 +4060,12 @@ static void qib_update_7322_usrhead(struct qib_ctxtdata *rcd, u64 hd,*/ if (hd >>IBA7322_HDRHEAD_PKTINT_SHIFT )adjust_rcv_timeout (rcd, npkts); -qib_write_ureg (rcd->dd, ur_rcvhdrhead, hd, rcd->ctxt); -qib_write_ureg (rcd->dd, ur_rcvhdrhead, hd, rcd->ctxt);if (updegr)qib_write_ureg (rcd->dd, ur_rcvegrindexhead, egrhd, rcd->ctxt); +mmiowb (); +qib_write_ureg (rcd->dd, ur_rcvhdrhead, hd, rcd->ctxt); +qib_write_ureg (rcd->dd, ur_rcvhdrhead, hd, rcd->ctxt); +mmiowb (); }static u32 qib_7322_hdrqempty (struct qib_ctxtdata *rcd)
drivers/net/bonding/bond_main.c +7 -2
@@ -1905,7 +1905,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)"but new slave device does not support netpoll.\n" , bond_dev->name); res = -EBUSY ; - goto err_close; + goto err_detach; } }#endif
@@ -1914,7 +1914,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) res =bond_create_slave_symlinks (bond_dev, slave_dev);if (res) - goto err_close; + goto err_detach; res =netdev_rx_handler_register (slave_dev, bond_handle_frame, new_slave);
@@ -1935,6 +1935,11 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) err_dest_symlinks:bond_destroy_slave_symlinks (bond_dev, slave_dev); +err_detach: +write_lock_bh (&bond->lock); +bond_detach_slave (bond, new_slave); +write_unlock_bh (&bond->lock); + err_close:dev_close (slave_dev);
drivers/net/usb/asix.c +5 -1
@@ -371,7 +371,7 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb)skb_pull (skb, (size +1 ) &0xfffe ); -if (skb->len ==0 ) +if (skb->len <sizeof (header))break ; head = (u8 *) skb->data;
@@ -1560,6 +1560,10 @@ static const struct usb_device_id products [] = {// ASIX 88772a USB_DEVICE(0x0db0, 0xa877), .driver_info = (unsigned long) &ax88772_info, +}, { +// Asus USB Ethernet Adapter + USB_DEVICE (0x0b95, 0x7e2b), + .driver_info = (unsigned long) &ax88772_info, }, { }, // END };
drivers/net/wireless/rt2x00/rt2800usb.c +1 -1
@@ -878,6 +878,7 @@ static struct usb_device_id rt2800usb_device_table[] = { { USB_DEVICE(0x13b1, 0x0031) }, { USB_DEVICE(0x1737, 0x0070) }, { USB_DEVICE(0x1737, 0x0071) }, + { USB_DEVICE(0x1737, 0x0077) },/* Logitec */ { USB_DEVICE(0x0789, 0x0162) }, { USB_DEVICE(0x0789, 0x0163) },
@@ -1069,7 +1070,6 @@ static struct usb_device_id rt2800usb_device_table[] = { { USB_DEVICE(0x1740, 0x0605) }, { USB_DEVICE(0x1740, 0x0615) },/* Linksys */ - { USB_DEVICE(0x1737, 0x0077) }, { USB_DEVICE(0x1737, 0x0078) },/* Logitec */ { USB_DEVICE(0x0789, 0x0168) },
drivers/net/wireless/wl12xx/boot.c +14 -0
@@ -328,6 +328,9 @@ static int wl1271_boot_upload_nvs(struct wl1271 *wl) nvs_ptr +=3 ;for (i =0 ; i < burst_len; i++) { +if (nvs_ptr +3 >= (u8 *) wl->nvs + nvs_len) + goto out_badnvs; + val = (nvs_ptr[0 ] | (nvs_ptr[1 ] <<8 ) | (nvs_ptr[2 ] <<16 ) | (nvs_ptr[3 ] <<24 ));
@@ -339,6 +342,9 @@ static int wl1271_boot_upload_nvs(struct wl1271 *wl) nvs_ptr +=4 ; dest_addr +=4 ; } + +if (nvs_ptr >= (u8 *) wl->nvs + nvs_len) + goto out_badnvs; }/*
@@ -350,6 +356,10 @@ static int wl1271_boot_upload_nvs(struct wl1271 *wl)*/ nvs_ptr = (u8 *)wl->nvs +ALIGN (nvs_ptr - (u8 *)wl->nvs +7 ,4 ); + +if (nvs_ptr >= (u8 *) wl->nvs + nvs_len) + goto out_badnvs; + nvs_len -= nvs_ptr - (u8 *)wl->nvs;/* Now we must set the partition correctly */
@@ -365,6 +375,10 @@ static int wl1271_boot_upload_nvs(struct wl1271 *wl)kfree (nvs_aligned);return 0 ; + +out_badnvs: +wl1271_error ("nvs data is malformed" ); +return -EILSEQ ; }static void wl1271_boot_enable_interrupts (struct wl1271 *wl)
drivers/net/wireless/wl12xx/cmd.c +22 -0
@@ -121,6 +121,11 @@ int wl1271_cmd_general_parms(struct wl1271 *wl)if (!wl->nvs)return -ENODEV ; +if (gp->tx_bip_fem_manufacturer >=WL1271_INI_FEM_MODULE_COUNT ) { +wl1271_warning ("FEM index from INI out of bounds" ); +return -EINVAL ; + } + gen_parms =kzalloc (sizeof (*gen_parms),GFP_KERNEL );if (!gen_parms)return -ENOMEM ;
@@ -144,6 +149,12 @@ int wl1271_cmd_general_parms(struct wl1271 *wl) gp->tx_bip_fem_manufacturer = gen_parms->general_params.tx_bip_fem_manufacturer; +if (gp->tx_bip_fem_manufacturer >=WL1271_INI_FEM_MODULE_COUNT ) { +wl1271_warning ("FEM index from FW out of bounds" ); + ret = -EINVAL ; + goto out; + } +wl1271_debug (DEBUG_CMD ,"FEM autodetect: %s, manufacturer: %d\n" , answer ?"auto" :"manual" , gp->tx_bip_fem_manufacturer);
@@ -163,6 +174,11 @@ int wl128x_cmd_general_parms(struct wl1271 *wl)if (!wl->nvs)return -ENODEV ; +if (gp->tx_bip_fem_manufacturer >=WL1271_INI_FEM_MODULE_COUNT ) { +wl1271_warning ("FEM index from ini out of bounds" ); +return -EINVAL ; + } + gen_parms =kzalloc (sizeof (*gen_parms),GFP_KERNEL );if (!gen_parms)return -ENOMEM ;
@@ -187,6 +203,12 @@ int wl128x_cmd_general_parms(struct wl1271 *wl) gp->tx_bip_fem_manufacturer = gen_parms->general_params.tx_bip_fem_manufacturer; +if (gp->tx_bip_fem_manufacturer >=WL1271_INI_FEM_MODULE_COUNT ) { +wl1271_warning ("FEM index from FW out of bounds" ); + ret = -EINVAL ; + goto out; + } +wl1271_debug (DEBUG_CMD ,"FEM autodetect: %s, manufacturer: %d\n" , answer ?"auto" :"manual" , gp->tx_bip_fem_manufacturer);
drivers/scsi/mpt2sas/mpt2sas_scsih.c +1 -0
@@ -7211,6 +7211,7 @@ _scsih_remove(struct pci_dev *pdev) }sas_remove_host (shost); +mpt2sas_base_detach (ioc);list_del (&ioc->list);scsi_remove_host (shost);scsi_host_put (shost);
drivers/tty/serial/atmel_serial.c +3 -2
@@ -199,8 +199,9 @@ void atmel_config_rs485(struct uart_port *port, struct serial_rs485 *rs485conf) {struct atmel_uart_port *atmel_port =to_atmel_uart_port (port);unsigned int mode; +unsigned long flags; -spin_lock (&port->lock); +spin_lock_irqsave (&port->lock, flags);/* Disable interrupts */ UART_PUT_IDR (port, atmel_port->tx_done_mask);
@@ -231,7 +232,7 @@ void atmel_config_rs485(struct uart_port *port, struct serial_rs485 *rs485conf)/* Enable interrupts */ UART_PUT_IER (port, atmel_port->tx_done_mask); -spin_unlock (&port->lock); +spin_unlock_irqrestore (&port->lock, flags); }
drivers/usb/class/cdc-acm.c +14 -2
@@ -554,10 +554,18 @@ static void acm_port_down(struct acm *acm)static void acm_tty_hangup (struct tty_struct *tty) { -struct acm *acm = tty->driver_data; -tty_port_hangup (&acm->port); +struct acm *acm; +mutex_lock (&open_mutex); + acm = tty->driver_data; + +if (!acm) + goto out; + +tty_port_hangup (&acm->port);acm_port_down (acm); + +out:mutex_unlock (&open_mutex); }
@@ -1183,6 +1191,8 @@ made_compressed_probe: i =device_create_file (&intf->dev, &dev_attr_wCountryCodes);if (i <0 ) {kfree (acm->country_codes); + acm->country_codes =NULL ; + acm->country_code_size =0 ; goto skip_countries; }
@@ -1191,6 +1201,8 @@ made_compressed_probe:if (i <0 ) {device_remove_file (&intf->dev, &dev_attr_wCountryCodes);kfree (acm->country_codes); + acm->country_codes =NULL ; + acm->country_code_size =0 ; goto skip_countries; } }
drivers/usb/core/hcd.c +2 -3
@@ -1387,11 +1387,10 @@ int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb, ret = -EAGAIN ; else urb->transfer_flags |= URB_DMA_MAP_SG; -if (n != urb->num_sgs) { - urb->num_sgs = n; + urb->num_mapped_sgs = n; +if (n != urb->num_sgs) urb->transfer_flags |=URB_DMA_SG_COMBINED ; - } }else if (urb->sg) {struct scatterlist *sg = urb->sg; urb->transfer_dma = dma_map_page(
drivers/usb/core/quirks.c +4 -1
@@ -117,9 +117,12 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x06a3, 0x0006), .driver_info = USB_QUIRK_CONFIG_INTF_STRINGS }, - /* Guillemot Webcam Hercules Dualpix Exchange*/ + /* Guillemot Webcam Hercules Dualpix Exchange (2nd ID) */ { USB_DEVICE(0x06f8, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Guillemot Webcam Hercules Dualpix Exchange*/ + { USB_DEVICE(0x06f8, 0x3005), .driver_info = USB_QUIRK_RESET_RESUME }, + /* M-Systems Flash Disk Pioneers */ { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
drivers/usb/host/ehci-q.c +1 -1
@@ -649,7 +649,7 @@ qh_urb_transaction (/* * data transfer stage: buffer setup */ - i = urb->num_sgs; + i = urb->num_mapped_sgs;if (len >0 && i >0 ) { sg = urb->sg; buf =sg_dma_address (sg);
drivers/usb/host/ohci-hcd.c +6 -9
@@ -389,17 +389,14 @@ ohci_shutdown (struct usb_hcd *hcd)struct ohci_hcd *ohci; ohci =hcd_to_ohci (hcd); -ohci_writel (ohci,OHCI_INTR_MIE , &ohci->regs->intrdisable); - ohci->hc_control =ohci_readl (ohci, &ohci->regs->control); +ohci_writel (ohci, (u32 ) ~0 , &ohci->regs->intrdisable); -/* If the SHUTDOWN quirk is set, don't put the controller in RESET */ - ohci->hc_control &= (ohci->flags &OHCI_QUIRK_SHUTDOWN ? -OHCI_CTRL_RWC |OHCI_CTRL_HCFS : -OHCI_CTRL_RWC ); -ohci_writel (ohci, ohci->hc_control, &ohci->regs->control); +/* Software reset, after which the controller goes into SUSPEND */ +ohci_writel (ohci,OHCI_HCR , &ohci->regs->cmdstatus); +ohci_readl (ohci, &ohci->regs->cmdstatus);/* flush the writes */ +udelay (10 ); -/* flush the writes */ - (void )ohci_readl (ohci, &ohci->regs->control); +ohci_writel (ohci, ohci->fminterval, &ohci->regs->fminterval); }static int check_ed (struct ohci_hcd *ohci,struct ed *ed)
drivers/usb/host/ohci-pci.c +0 -26
@@ -175,28 +175,6 @@ static int ohci_quirk_amd700(struct usb_hcd *hcd)return 0 ; } -/* nVidia controllers continue to drive Reset signalling on the bus -* even after system shutdown, wasting power. This flag tells the -* shutdown routine to leave the controller OPERATIONAL instead of RESET. -*/ -static int ohci_quirk_nvidia_shutdown (struct usb_hcd *hcd) -{ -struct pci_dev *pdev =to_pci_dev (hcd->self.controller); -struct ohci_hcd *ohci =hcd_to_ohci (hcd); - -/* Evidently nVidia fixed their later hardware; this is a guess at -* the changeover point. -*/ -#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_USB 0x026d - -if (pdev->device <PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_USB ) { - ohci->flags |=OHCI_QUIRK_SHUTDOWN ; -ohci_dbg (ohci,"enabled nVidia shutdown quirk\n" ); - } - -return 0 ; -} -static void sb800_prefetch (struct ohci_hcd *ohci,int on) {struct pci_dev *pdev;
@@ -260,10 +238,6 @@ static const struct pci_device_id ohci_pci_quirks[] = { PCI_DEVICE(PCI_VENDOR_ID_ATI, 0x4399), .driver_data = (unsigned long)ohci_quirk_amd700, }, - { -PCI_DEVICE (PCI_VENDOR_ID_NVIDIA ,PCI_ANY_ID ), - .driver_data = (unsigned long) ohci_quirk_nvidia_shutdown, - },/* FIXME for some of the early AMD 760 southbridges, OHCI * won't work at all. blacklist them.
drivers/usb/host/ohci.h +0 -1
@@ -403,7 +403,6 @@ struct ohci_hcd {#define OHCI_QUIRK_HUB_POWER 0x100/* distrust firmware power/oc setup */ #define OHCI_QUIRK_AMD_PLL 0x200/* AMD PLL quirk*/ #define OHCI_QUIRK_AMD_PREFETCH 0x400/* pre-fetch for ISO transfer */ -#define OHCI_QUIRK_SHUTDOWN 0x800/* nVidia power bug */ // there are also chip quirks/bugs in init logic struct work_struct nec_work;/* Worker for NEC quirk */
drivers/usb/host/pci-quirks.c +22 -28
75 lines not on this page · raw message
drivers/usb/host/uhci-q.c +1 -1
@@ -943,7 +943,7 @@ static int uhci_submit_common(struct uhci_hcd *uhci, struct urb *urb,if (usb_pipein (urb->pipe)) status |=TD_CTRL_SPD ; - i = urb->num_sgs; + i = urb->num_mapped_sgs;if (len >0 && i >0 ) { sg = urb->sg; data =sg_dma_address (sg);
drivers/usb/host/whci/qset.c +2 -2
@@ -443,7 +443,7 @@ static int qset_add_urb_sg(struct whc *whc, struct whc_qset *qset, struct urb *u remaining = urb->transfer_buffer_length; -for_each_sg (urb->sg, sg, urb->num_sgs, i) { +for_each_sg (urb->sg, sg, urb->num_mapped_sgs, i) {dma_addr_t dma_addr;size_t dma_remaining;dma_addr_t sp, ep;
@@ -561,7 +561,7 @@ static int qset_add_urb_sg_linearize(struct whc *whc, struct whc_qset *qset, remaining = urb->transfer_buffer_length; -for_each_sg (urb->sg, sg, urb->num_sgs, i) { +for_each_sg (urb->sg, sg, urb->num_mapped_sgs, i) {size_t len;size_t sg_remaining;void *orig;
drivers/usb/host/xhci-ring.c +2 -2
@@ -2570,7 +2570,7 @@ static unsigned int count_sg_trbs_needed(struct xhci_hcd *xhci, struct urb *urb)struct scatterlist *sg; sg =NULL ; - num_sgs = urb->num_sgs; + num_sgs = urb->num_mapped_sgs; temp = urb->transfer_buffer_length;xhci_dbg (xhci,"count sg list trbs: \n" );
@@ -2754,7 +2754,7 @@ static int queue_bulk_sg_tx(struct xhci_hcd *xhci, gfp_t mem_flags,return -EINVAL ; num_trbs =count_sg_trbs_needed (xhci, urb); - num_sgs = urb->num_sgs; + num_sgs = urb->num_mapped_sgs; total_packet_count =roundup (urb->transfer_buffer_length,le16_to_cpu (urb->ep->desc.wMaxPacketSize));
drivers/usb/host/xhci.c +2 -2
@@ -1568,6 +1568,7 @@ static int xhci_configure_endpoint_result(struct xhci_hcd *xhci,/* FIXME: can we allocate more resources for the HC? */ break ;case COMP_BW_ERR : +case COMP_2ND_BW_ERR :dev_warn (&udev->dev,"Not enough bandwidth " "for new device state.\n" ); ret = -ENOSPC ;
@@ -2183,8 +2184,7 @@ static int xhci_calculate_streams_and_bitmask(struct xhci_hcd *xhci,if (ret <0 )return ret; - max_streams =USB_SS_MAX_STREAMS ( - eps[i]->ss_ep_comp.bmAttributes); + max_streams =usb_ss_max_streams (&eps[i]->ss_ep_comp);if (max_streams < (*num_streams -1 )) { xhci_dbg(xhci, "Ep 0x%x only supports %u stream IDs.\n", eps[i]->desc.bEndpointAddress,
drivers/usb/host/xhci.h +0 -1
@@ -900,7 +900,6 @@ struct xhci_transfer_event {/* Invalid Stream ID Error */ #define COMP_STRID_ERR 34/* Secondary Bandwidth Error - may be returned by a Configure Endpoint cmd */ -/* FIXME - check for this */ #define COMP_2ND_BW_ERR 35/* Split Transaction Error */ #define COMP_SPLIT_ERR 36
drivers/usb/misc/isight_firmware.c +4 -2
@@ -55,8 +55,9 @@ static int isight_firmware_load(struct usb_interface *intf, ptr = firmware->data; + buf[0 ] =0x01 ;if (usb_control_msg - (dev,usb_sndctrlpipe (dev,0 ),0xa0 ,0x40 ,0xe600 ,0 ,"\1" ,1 , + (dev,usb_sndctrlpipe (dev,0 ),0xa0 ,0x40 ,0xe600 ,0 , buf,1 ,300 ) !=1 ) {printk (KERN_ERR "Failed to initialise isight firmware loader\n" );
@@ -100,8 +101,9 @@ static int isight_firmware_load(struct usb_interface *intf, } } + buf[0 ] =0x00 ;if (usb_control_msg - (dev,usb_sndctrlpipe (dev,0 ),0xa0 ,0x40 ,0xe600 ,0 ,"\0" ,1 , + (dev,usb_sndctrlpipe (dev,0 ),0xa0 ,0x40 ,0xe600 ,0 , buf,1 ,300 ) !=1 ) {printk (KERN_ERR "isight firmware loading completion failed\n" ); ret = -ENODEV ;
drivers/usb/musb/musb_core.c +0 -2
@@ -2078,8 +2078,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)if (status <0 ) goto fail3; -pm_runtime_put (musb->controller); - status =musb_init_debugfs (musb);if (status <0 ) goto fail4;
drivers/usb/serial/cp210x.c +1 -0
@@ -92,6 +92,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x10C4, 0x818B) }, /* AVIT Research USB to TTL */ { USB_DEVICE(0x10C4, 0x819F) }, /* MJS USB Toslink Switcher */ { USB_DEVICE(0x10C4, 0x81A6) }, /* ThinkOptics WavIt */ + { USB_DEVICE(0x10C4, 0x81A9) }, /* Multiplex RC Interface */ { USB_DEVICE(0x10C4, 0x81AC) }, /* MSD Dash Hawk */ { USB_DEVICE(0x10C4, 0x81AD) }, /* INSYS USB Modem */ { USB_DEVICE(0x10C4, 0x81C8) }, /* Lipowsky Industrie Elektronik GmbH, Baby-JTAG */
drivers/usb/serial/omninet.c +1 -1
@@ -315,7 +315,7 @@ static int omninet_write_room(struct tty_struct *tty)int room =0 ;/* Default: no room */ /* FIXME: no consistent locking for write_urb_busy */ -if (wport->write_urb_busy) +if (!wport->write_urb_busy) room = wport->bulk_out_size -OMNINET_HEADERLEN ;dbg ("%s - returns %d" , __func__, room);
drivers/usb/serial/option.c +10 -0
@@ -472,6 +472,14 @@ static void option_instat_callback(struct urb *urb);#define YUGA_PRODUCT_CLU528 0x260D#define YUGA_PRODUCT_CLU526 0x260F +/* Viettel products */ +#define VIETTEL_VENDOR_ID 0x2262 +#define VIETTEL_PRODUCT_VT1000 0x0002 + +/* ZD Incorporated */ +#define ZD_VENDOR_ID 0x0685 +#define ZD_PRODUCT_7000 0x7000 +/* some devices interfaces need special handling due to a number of reasons */ enum option_blacklist_reason {OPTION_BLACKLIST_NONE =0 ,
@@ -1173,6 +1181,8 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CLU516) }, { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CLU528) }, { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CLU526) }, + { USB_DEVICE_AND_INTERFACE_INFO(VIETTEL_VENDOR_ID, VIETTEL_PRODUCT_VT1000, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZD_VENDOR_ID, ZD_PRODUCT_7000, 0xff, 0xff, 0xff) }, { } /* Terminating entry */ };MODULE_DEVICE_TABLE (usb, option_ids);
drivers/usb/storage/usb.c +1 -0
@@ -1073,6 +1073,7 @@ static struct usb_driver usb_storage_driver = { .id_table = usb_storage_usb_ids, .supports_autosuspend = 1, .soft_unbind = 1, + .no_dynamic_id = 1, };static int __init usb_stor_init (void )
drivers/video/offb.c +24 -28
67 lines not on this page · raw message
fs/ext3/inode.c +21 -3
@@ -1568,7 +1568,13 @@ static int ext3_ordered_writepage(struct page *page,int err;J_ASSERT (PageLocked (page)); -WARN_ON_ONCE (IS_RDONLY (inode)); +/* +* We don't want to warn for emergency remount. The condition is +* ordered to avoid dereferencing inode->i_sb in non-error case to +* avoid slow-downs. +*/ +WARN_ON_ONCE (IS_RDONLY (inode) && + !(EXT3_SB (inode->i_sb)->s_mount_state &EXT3_ERROR_FS ));/* * We give up here if we're reentered, because it might be for a
@@ -1642,7 +1648,13 @@ static int ext3_writeback_writepage(struct page *page,int err;J_ASSERT (PageLocked (page)); -WARN_ON_ONCE (IS_RDONLY (inode)); +/* +* We don't want to warn for emergency remount. The condition is +* ordered to avoid dereferencing inode->i_sb in non-error case to +* avoid slow-downs. +*/ +WARN_ON_ONCE (IS_RDONLY (inode) && + !(EXT3_SB (inode->i_sb)->s_mount_state &EXT3_ERROR_FS ));if (ext3_journal_current_handle ()) goto out_fail;
@@ -1684,7 +1696,13 @@ static int ext3_journalled_writepage(struct page *page,int err;J_ASSERT (PageLocked (page)); -WARN_ON_ONCE (IS_RDONLY (inode)); +/* +* We don't want to warn for emergency remount. The condition is +* ordered to avoid dereferencing inode->i_sb in non-error case to +* avoid slow-downs. +*/ +WARN_ON_ONCE (IS_RDONLY (inode) && + !(EXT3_SB (inode->i_sb)->s_mount_state &EXT3_ERROR_FS ));if (ext3_journal_current_handle ()) goto no_write;
fs/reiserfs/super.c +16 -11
@@ -453,16 +453,20 @@ int remove_save_link(struct inode *inode, int truncate)static void reiserfs_kill_sb (struct super_block *s) {if (REISERFS_SB (s)) { -if (REISERFS_SB (s)->xattr_root) { -d_invalidate (REISERFS_SB (s)->xattr_root); -dput (REISERFS_SB (s)->xattr_root); -REISERFS_SB (s)->xattr_root =NULL ; - } -if (REISERFS_SB (s)->priv_root) { -d_invalidate (REISERFS_SB (s)->priv_root); -dput (REISERFS_SB (s)->priv_root); -REISERFS_SB (s)->priv_root =NULL ; - } +/* +* Force any pending inode evictions to occur now. Any +* inodes to be removed that have extended attributes +* associated with them need to clean them up before +* we can release the extended attribute root dentries. +* shrink_dcache_for_umount will BUG if we don't release +* those before it's called so ->put_super is too late. +*/ +shrink_dcache_sb (s); + +dput (REISERFS_SB (s)->xattr_root); +REISERFS_SB (s)->xattr_root =NULL ; +dput (REISERFS_SB (s)->priv_root); +REISERFS_SB (s)->priv_root =NULL ; }kill_block_super (s);
@@ -1164,7 +1168,8 @@ static void handle_quota_files(struct super_block *s, char **qf_names,kfree (REISERFS_SB (s)->s_qf_names[i]); REISERFS_SB(s)->s_qf_names[i] = qf_names[i]; } -REISERFS_SB (s)->s_jquota_fmt = *qfmt; +if (*qfmt) +REISERFS_SB (s)->s_jquota_fmt = *qfmt; }#endif
fs/udf/file.c +3 -3
@@ -125,7 +125,6 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov, err =udf_expand_file_adinicb (inode);if (err) {udf_debug ("udf_expand_adinicb: err=%d\n" , err); -up_write (&iinfo->i_data_sem);return err; } }else {
@@ -133,9 +132,10 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov, iinfo->i_lenAlloc = pos + count; else iinfo->i_lenAlloc = inode->i_size; +up_write (&iinfo->i_data_sem); } - } -up_write (&iinfo->i_data_sem); + }else +up_write (&iinfo->i_data_sem); retval =generic_file_aio_write (iocb, iov, nr_segs, ppos);if (retval >0 )
fs/udf/inode.c +18 -3
@@ -145,6 +145,12 @@ const struct address_space_operations udf_aops = { .bmap = udf_bmap, }; +/* +* Expand file stored in ICB to a normal one-block-file +* +* This function requires i_data_sem for writing and releases it. +* This function requires i_mutex held +*/ int udf_expand_file_adinicb (struct inode *inode) {struct page *page;
@@ -163,9 +169,15 @@ int udf_expand_file_adinicb(struct inode *inode) iinfo->i_alloc_type =ICBTAG_FLAG_AD_LONG ;/* from now on we have normal address_space methods */ inode->i_data.a_ops = &udf_aops; +up_write (&iinfo->i_data_sem);mark_inode_dirty (inode);return 0 ; } +/* +* Release i_data_sem so that we can lock a page - page lock ranks +* above i_data_sem. i_mutex still protects us against file changes. +*/ +up_write (&iinfo->i_data_sem); page =find_or_create_page (inode->i_mapping,0 ,GFP_NOFS );if (!page)
@@ -181,6 +193,7 @@ int udf_expand_file_adinicb(struct inode *inode)SetPageUptodate (page);kunmap (page); } +down_write (&iinfo->i_data_sem);memset (iinfo->i_ext.i_data + iinfo->i_lenEAttr,0x00 , iinfo->i_lenAlloc); iinfo->i_lenAlloc =0 ;
@@ -190,17 +203,20 @@ int udf_expand_file_adinicb(struct inode *inode) iinfo->i_alloc_type =ICBTAG_FLAG_AD_LONG ;/* from now on we have normal address_space methods */ inode->i_data.a_ops = &udf_aops; +up_write (&iinfo->i_data_sem); err = inode->i_data.a_ops->writepage (page, &udf_wbc);if (err) {/* Restore everything back so that we don't lose data... */ lock_page (page); kaddr =kmap (page); +down_write (&iinfo->i_data_sem);memcpy (iinfo->i_ext.i_data + iinfo->i_lenEAttr, kaddr, inode->i_size);kunmap (page);unlock_page (page); iinfo->i_alloc_type =ICBTAG_FLAG_AD_IN_ICB ; inode->i_data.a_ops = &udf_adinicb_aops; +up_write (&iinfo->i_data_sem); }page_cache_release (page);mark_inode_dirty (inode);
@@ -1105,10 +1121,9 @@ int udf_setsize(struct inode *inode, loff_t newsize)if (bsize < (udf_file_entry_alloc_offset (inode) + newsize)) { err =udf_expand_file_adinicb (inode); -if (err) { -up_write (&iinfo->i_data_sem); +if (err)return err; - } +down_write (&iinfo->i_data_sem); }else iinfo->i_lenAlloc = newsize; }
fs/xfs/linux-2.6/xfs_acl.c +1 -1
@@ -39,7 +39,7 @@ xfs_acl_from_disk(struct xfs_acl *aclp)struct posix_acl_entry *acl_e;struct posix_acl *acl;struct xfs_acl_entry *ace; -int count, i; +unsigned int count, i; count =be32_to_cpu (aclp->acl_cnt);if (count >XFS_ACL_MAX_ENTRIES )
include/linux/usb.h +1 -0
@@ -1202,6 +1202,7 @@ struct urb {void *transfer_buffer;/* (in) associated data buffer */ dma_addr_t transfer_dma;/* (in) dma addr for transfer_buffer */ struct scatterlist *sg;/* (in) scatter gather buffer list */ +int num_mapped_sgs;/* (internal) mapped sg entries */ int num_sgs;/* (in) number of entries in the sg list */ u32 transfer_buffer_length;/* (in) data buffer length */ u32 actual_length;/* (return) actual transfer length */
include/linux/usb/ch9.h +19 -1
@@ -583,8 +583,26 @@ struct usb_ss_ep_comp_descriptor { } __attribute__ ((packed));#define USB_DT_SS_EP_COMP_SIZE 6 +/* Bits 4:0 of bmAttributes if this is a bulk endpoint */ -#define USB_SS_MAX_STREAMS (p) (1 << ((p) & 0x1f)) +static inline int +usb_ss_max_streams (const struct usb_ss_ep_comp_descriptor *comp) +{ +int max_streams; + +if (!comp) +return 0 ; + + max_streams = comp->bmAttributes &0x1f ; + +if (!max_streams) +return 0 ; + + max_streams =1 << max_streams; + +return max_streams; +} +/* Bits 1:0 of bmAttributes if this is an isoc endpoint */ #define USB_SS_MULT (p) (1 + ((p) & 0x3))
kernel/cgroup.c +3 -3
@@ -1173,10 +1173,10 @@ static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts)/* * If the 'all' option was specified select all the subsystems, -* otherwise 'all, 'none' and a subsystem name options were not -* specified, let's default to 'all' +* otherwise if 'none', 'name=' and a subsystem name options +* were not specified, let's default to 'all' */ -if (all_ss || (!all_ss && !one_ss && !opts->none)) { +if (all_ss || (!one_ss && !opts->none && !opts->name)) {for (i =0 ; i <CGROUP_SUBSYS_COUNT ; i++) {struct cgroup_subsys *ss = subsys[i];if (ss ==NULL )
kernel/cpu.c +74 -0
86 lines not on this page · raw message
net/ipv4/igmp.c +2 -0
@@ -875,6 +875,8 @@ static void igmp_heard_query(struct in_device *in_dev, struct sk_buff *skb,* to be intended in a v3 query. */ max_delay =IGMPV3_MRC (ih3->code)*(HZ /IGMP_TIMER_SCALE ); +if (!max_delay) + max_delay =1 ;/* can't mod w/ 0 */ }else {/* v3 */ if (!pskb_may_pull (skb,sizeof (struct igmpv3_query )))return ;
tools/perf/util/trace-event-parse.c +2 -0
@@ -1582,6 +1582,8 @@ process_symbols(struct event *event, struct print_arg *arg, char **tok) field =malloc_or_die (sizeof (*field)); type =process_arg (event, field, &token); +while (type ==EVENT_OP ) + type =process_op (event, field, &token);if (test_type_token (type, token,EVENT_DELIM ,"," )) goto out_free;