Linux 3.4.24
Greg KH
maintainerI'm announcing the release of the 3.4.24 kernel.
All users of the 3.4 kernel series must upgrade.
The updated 3.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.4.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
------------
Makefile | 2 arch/arm/include/asm/hwcap.h | 3 - arch/arm/include/asm/vfpmacros.h | 12 ++--- arch/arm/vfp/vfpmodule.c | 9 ++-- arch/x86/kernel/hpet.c | 4 - drivers/acpi/battery.c | 77 +++++++++++++++++++++++++++++++++++ drivers/acpi/sleep.c | 8 +++ drivers/acpi/video.c | 14 ++++++ drivers/gpu/drm/i915/intel_bios.c | 11 ----- drivers/gpu/drm/i915/intel_display.c | 11 +++++ drivers/hwmon/fam15h_power.c | 4 + drivers/mmc/host/sh_mmcif.c | 8 --- drivers/pnp/pnpacpi/core.c | 3 + drivers/staging/telephony/ixj.c | 24 +++++----- drivers/usb/class/cdc-acm.c | 38 +++++++++++++++++ drivers/usb/host/ohci-q.c | 19 ++++++++ drivers/usb/host/xhci-pci.c | 7 ++- drivers/usb/serial/cp210x.c | 1 drivers/usb/serial/ftdi_sio.c | 3 - drivers/usb/serial/ftdi_sio_ids.h | 6 ++ drivers/usb/serial/option.c | 25 +++++++++++ drivers/usb/storage/Kconfig | 2 include/linux/mempolicy.h | 16 ------- kernel/rcutree.c | 14 +++--- kernel/trace/ftrace.c | 2 kernel/workqueue.c | 4 - mm/dmapool.c | 31 +++----------- mm/mempolicy.c | 22 ---------- mm/shmem.c | 26 +++++++---- sound/soc/Makefile | 5 +- tools/perf/builtin-test.c | 38 +++++------------ 31 files changed, 295 insertions(+), 154 deletions(-)
Alan Stern (1):
USB: OHCI: workaround for hardware bug: retired TDs not added to the Done Queue
Bjørn Mork (1):
USB: option: blacklist network interface on Huawei E173
Boris Ostrovsky (1):
x86,AMD: Power driver support for AMD's family 16h processors
Chris Ball (1):
Revert misapplied "mmc: sh-mmcif: avoid oops on spurious interrupts"
Dan Carpenter (2):
telephony: ijx: buffer overflow in ixj_write_cid()
ftrace: Clear bits properly in reset_iter_read()
Dan Williams (1):
cdc-acm: implement TIOCSSERIAL to avoid blocking close(2)
Eric Dumazet (1):
rcu: Fix batch-limit size problem
Greg Kroah-Hartman (2):
USB: mark uas driver as BROKEN
Linux 3.4.24
Guennadi Liakhovetski (1):
mmc: sh-mmcif: avoid oops on spurious interrupts (second try)
Jan Beulich (1):
x86: hpet: Fix masking of MSI interrupts
Jani Nikula (2):
drm/i915: do not ignore eDP bpc settings from vbt drm/i915: do not default to 18 bpp for eDP if missing from VBT
Kamil Iskra (1):
ACPI / battery: Correct battery capacity values on Thinkpads
Lan Tianyu (1):
ACPI / PM: Add Sony Vaio VPCEB1S1E to nonvs blacklist.
Marek Szyprowski (1):
mm: dmapool: use provided gfp flags for all dma_alloc_coherent() calls
Markus Becker (1):
USB: cp210x: add Virtenio Preon32 device id
Martin Teichmann (1):
USB: ftdi_sio: Add support for Newport AGILIS motor drivers
Mel Gorman (1):
tmpfs: fix shared mempolicy leak
Paul Walmsley (1):
ARM: 7566/1: vfp: fix save and restore when running on pre-VFPv3 and CONFIG_VFPv3 set
Peter Korsgaard (1):
usb: ftdi_sio: fixup BeagleBone A5+ quirk
Peter Ujfalusi (1):
ASoC: dmaengine: Correct Makefile when sound is built as module
Rafael J. Wysocki (1):
ACPI / PNP: Do not crash due to stale pointer use during system resume
Sarah Sharp (1):
xhci: Extend Fresco Logic MSI quirk.
Tejun Heo (1):
workqueue: convert BUG_ON()s in __queue_delayed_work() to WARN_ON_ONCE()s
Zhang Rui (1):
ACPI / video: ignore BIOS initial backlight value for HP Folio 13-2000
Zheng Liu (1):
perf test: fix a build error on builtin-test
[email protected] (1):
USB: add new zte 3g-dongle's pid to option.c
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 4 -SUBLEVEL = 23 +SUBLEVEL = 24 EXTRAVERSION = NAME = Saber-toothed Squirrel
arch/arm/include/asm/hwcap.h +2 -1
@@ -18,11 +18,12 @@#define HWCAP_THUMBEE (1 << 11)#define HWCAP_NEON (1 << 12)#define HWCAP_VFPv3 (1 << 13) -#define HWCAP_VFPv3D16 (1 << 14) +#define HWCAP_VFPv3D16 (1 << 14)/* also set for VFPv4-D16 */ #define HWCAP_TLS (1 << 15)#define HWCAP_VFPv4 (1 << 16)#define HWCAP_IDIVA (1 << 17)#define HWCAP_IDIVT (1 << 18) +#define HWCAP_VFPD32 (1 << 19)/* set if VFP has 32 regs (not 16) */ #define HWCAP_IDIV (HWCAP_IDIVA | HWCAP_IDIVT)#if defined(__KERNEL__)
arch/arm/include/asm/vfpmacros.h +6 -6
@@ -27,9 +27,9 @@#if __LINUX_ARM_ARCH__ <=6 ldr \tmp, =elf_hwcap @ may not have MVFR regs ldr \tmp, [\tmp, #0] - tst \tmp, #HWCAP_VFPv3D16 - ldceql p11, cr0, [\base],#32*4 @ FLDMIAD \base!, {d16-d31} - addne \base, \base, #32*4 @ step over unused register space + tst \tmp, #HWCAP_VFPD32 + ldcnel p11, cr0, [\base],#32*4 @ FLDMIAD \base!, {d16-d31} + addeq \base, \base, #32*4 @ step over unused register space#else VFPFMRX \tmp, MVFR0 @ Media and VFP Feature Register 0 and \tmp, \tmp, #MVFR0_A_SIMD_MASK @ A_SIMD field
@@ -51,9 +51,9 @@#if __LINUX_ARM_ARCH__ <=6 ldr \tmp, =elf_hwcap @ may not have MVFR regs ldr \tmp, [\tmp, #0] - tst \tmp, #HWCAP_VFPv3D16 - stceql p11, cr0, [\base],#32*4 @ FSTMIAD \base!, {d16-d31} - addne \base, \base, #32*4 @ step over unused register space + tst \tmp, #HWCAP_VFPD32 + stcnel p11, cr0, [\base],#32*4 @ FSTMIAD \base!, {d16-d31} + addeq \base, \base, #32*4 @ step over unused register space#else VFPFMRX \tmp, MVFR0 @ Media and VFP Feature Register 0 and \tmp, \tmp, #MVFR0_A_SIMD_MASK @ A_SIMD field
arch/arm/vfp/vfpmodule.c +6 -3
@@ -701,11 +701,14 @@ static int __init vfp_init(void) elf_hwcap |= HWCAP_VFPv3;/* -* Check for VFPv3 D16. CPUs in this configuration -* only have 16 x 64bit registers. +* Check for VFPv3 D16 and VFPv4 D16. CPUs in +* this configuration only have 16 x 64bit +* registers. */ if (((fmrx (MVFR0 ) &MVFR0_A_SIMD_MASK )) ==1 ) - elf_hwcap |= HWCAP_VFPv3D16; + elf_hwcap |= HWCAP_VFPv3D16;/* also v4-D16 */ +else + elf_hwcap |= HWCAP_VFPD32; }#endif /*
arch/x86/kernel/hpet.c +2 -2
@@ -431,7 +431,7 @@ void hpet_msi_unmask(struct irq_data *data)/* unmask it */ cfg =hpet_readl (HPET_Tn_CFG (hdev->num)); - cfg |=HPET_TN_FSB ; + cfg |=HPET_TN_ENABLE |HPET_TN_FSB ;hpet_writel (cfg,HPET_Tn_CFG (hdev->num)); }
@@ -442,7 +442,7 @@ void hpet_msi_mask(struct irq_data *data)/* mask it */ cfg =hpet_readl (HPET_Tn_CFG (hdev->num)); - cfg &= ~HPET_TN_FSB ; + cfg &= ~(HPET_TN_ENABLE |HPET_TN_FSB );hpet_writel (cfg,HPET_Tn_CFG (hdev->num)); }
drivers/acpi/battery.c +77 -0
113 lines not on this page · raw message
drivers/acpi/sleep.c +8 -0
@@ -508,6 +508,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { }, { .callback = init_nvs_nosave, + .ident = "Sony Vaio VPCEB1S1E", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Sony Corporation" ), + DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB1S1E"), + }, + }, + { + .callback = init_nvs_nosave, .ident = "Sony Vaio VGN-FW520F", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
drivers/acpi/video.c +14 -0
@@ -389,6 +389,12 @@ static int __init video_set_bqc_offset(const struct dmi_system_id *d)return 0 ; } +static int video_ignore_initial_backlight (const struct dmi_system_id *d) +{ + use_bios_initial_backlight =0 ; +return 0 ; +} +static struct dmi_system_id video_dmi_table[]__initdata = {/* * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
@@ -433,6 +439,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = { DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 7720"), }, }, + { + .callback = video_ignore_initial_backlight, + .ident = "HP Folio 13-2000", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Folio 13 - 2000 Notebook PC"), + }, + }, {} };
drivers/gpu/drm/i915/intel_bios.c +2 -9
@@ -459,12 +459,8 @@ parse_edp(struct drm_i915_private *dev_priv, struct bdb_header *bdb) edp =find_section (bdb,BDB_EDP );if (!edp) { -if (SUPPORTS_EDP (dev_priv->dev) && dev_priv->edp.support) { -DRM_DEBUG_KMS ("No eDP BDB found but eDP panel " -"supported, assume %dbpp panel color " -"depth.\n" , - dev_priv->edp.bpp); - } +if (SUPPORTS_EDP (dev_priv->dev) && dev_priv->edp.support) +DRM_DEBUG_KMS ("No eDP BDB found but eDP panel supported.\n" );return ; }
@@ -617,9 +613,6 @@ init_vbt_defaults(struct drm_i915_private *dev_priv) dev_priv->lvds_use_ssc =1 ; dev_priv->lvds_ssc_freq =intel_bios_ssc_frequency (dev,1 );DRM_DEBUG_KMS ("Set default to SSC at %dMHz\n" , dev_priv->lvds_ssc_freq); - -/* eDP data */ - dev_priv->edp.bpp =18 ; }static int __init intel_no_opregion_vbt_callback (const struct dmi_system_id *id)
drivers/gpu/drm/i915/intel_display.c +11 -0
@@ -4996,6 +4996,17 @@ static bool intel_choose_pipe_bpp_dither(struct drm_crtc *crtc, } } +if (intel_encoder->type ==INTEL_OUTPUT_EDP ) { +/* Use VBT settings if we have an eDP panel */ +unsigned int edp_bpc = dev_priv->edp.bpp /3 ; + +if (edp_bpc && edp_bpc < display_bpc) { +DRM_DEBUG_KMS ("clamping display bpc (was %d) to eDP (%d)\n" , display_bpc, edp_bpc); + display_bpc = edp_bpc; + } +continue ; + } +/* * HDMI is either 12 or 8, so if the display lets 10bpc sneak * through, clamp it down. (Note: >12bpc will be caught below.)
drivers/hwmon/fam15h_power.c +4 -0
@@ -31,6 +31,9 @@ MODULE_DESCRIPTION("AMD Family 15h CPU processor power monitor");MODULE_AUTHOR ("Andreas Herrmann <[email protected]>" );MODULE_LICENSE ("GPL" ); +/* Family 16h Northbridge's function 4 PCI ID */ +#define PCI_DEVICE_ID_AMD_16H_NB_F4 0x1534 +/* D18F3 */ #define REG_NORTHBRIDGE_CAP 0xe8
@@ -256,6 +259,7 @@ static void __devexit fam15h_power_remove(struct pci_dev *pdev)static DEFINE_PCI_DEVICE_TABLE (fam15h_power_id_table) = { {PCI_VDEVICE (AMD ,PCI_DEVICE_ID_AMD_15H_NB_F4 ) }, + {PCI_VDEVICE (AMD ,PCI_DEVICE_ID_AMD_16H_NB_F4 ) }, {} };MODULE_DEVICE_TABLE (pci, fam15h_power_id_table);
drivers/mmc/host/sh_mmcif.c +2 -6
@@ -1066,7 +1066,6 @@ static irqreturn_t sh_mmcif_irqt(int irq, void *dev_id) {struct sh_mmcif_host *host = dev_id;struct mmc_request *mrq = host->mrq; -struct mmc_data *data = mrq->data;cancel_delayed_work_sync (&host->timeout_work);
@@ -1114,13 +1113,14 @@ static irqreturn_t sh_mmcif_irqt(int irq, void *dev_id)case MMCIF_WAIT_FOR_READ_END :case MMCIF_WAIT_FOR_WRITE_END :if (host->sd_error) - data->error =sh_mmcif_error_manage (host); + mrq->data->error =sh_mmcif_error_manage (host);break ;default :BUG (); }if (host->wait_for !=MMCIF_WAIT_FOR_STOP ) { +struct mmc_data *data = mrq->data;if (!mrq->cmd->error && data && !data->error) data->bytes_xfered = data->blocks * data->blksz;
@@ -1191,10 +1191,6 @@ static irqreturn_t sh_mmcif_intr(int irq, void *dev_id) host->sd_error = true;dev_dbg (&host->pd->dev,"int err state = %08x\n" , state); } -if (host->state ==STATE_IDLE ) { -dev_info (&host->pd->dev,"Spurious IRQ status 0x%x" , state); -return IRQ_HANDLED ; - }if (state & ~(INT_CMD12RBE |INT_CMD12CRE )) {if (!host->dma_active)return IRQ_WAKE_THREAD ;
drivers/pnp/pnpacpi/core.c +3 -0
@@ -95,6 +95,9 @@ static int pnpacpi_set_resources(struct pnp_dev *dev)return -ENODEV ; } +if (WARN_ON_ONCE (acpi_dev != dev->data)) + dev->data = acpi_dev; + ret =pnpacpi_build_resource_template (dev, &buffer);if (ret)return ret;
drivers/staging/telephony/ixj.c +12 -12
@@ -3190,12 +3190,12 @@ static void ixj_write_cid(IXJ *j)ixj_fsk_alloc (j); -strcpy (sdmf1, j->cid_send.month); -strcat (sdmf1, j->cid_send.day); -strcat (sdmf1, j->cid_send.hour); -strcat (sdmf1, j->cid_send.min); -strcpy (sdmf2, j->cid_send.number); -strcpy (sdmf3, j->cid_send.name); +strlcpy (sdmf1, j->cid_send.month,sizeof (sdmf1)); +strlcat (sdmf1, j->cid_send.day,sizeof (sdmf1)); +strlcat (sdmf1, j->cid_send.hour,sizeof (sdmf1)); +strlcat (sdmf1, j->cid_send.min,sizeof (sdmf1)); +strlcpy (sdmf2, j->cid_send.number,sizeof (sdmf2)); +strlcpy (sdmf3, j->cid_send.name,sizeof (sdmf3)); len1 =strlen (sdmf1); len2 =strlen (sdmf2);
@@ -3340,12 +3340,12 @@ static void ixj_write_cidcw(IXJ *j)ixj_pre_cid (j); } j->flags.cidcw_ack =0 ; -strcpy (sdmf1, j->cid_send.month); -strcat (sdmf1, j->cid_send.day); -strcat (sdmf1, j->cid_send.hour); -strcat (sdmf1, j->cid_send.min); -strcpy (sdmf2, j->cid_send.number); -strcpy (sdmf3, j->cid_send.name); +strlcpy (sdmf1, j->cid_send.month,sizeof (sdmf1)); +strlcat (sdmf1, j->cid_send.day,sizeof (sdmf1)); +strlcat (sdmf1, j->cid_send.hour,sizeof (sdmf1)); +strlcat (sdmf1, j->cid_send.min,sizeof (sdmf1)); +strlcpy (sdmf2, j->cid_send.number,sizeof (sdmf2)); +strlcpy (sdmf3, j->cid_send.name,sizeof (sdmf3)); len1 =strlen (sdmf1); len2 =strlen (sdmf2);
drivers/usb/class/cdc-acm.c +38 -0
@@ -788,6 +788,10 @@ static int get_serial_info(struct acm *acm, struct serial_struct __user *info) tmp.flags =ASYNC_LOW_LATENCY ; tmp.xmit_fifo_size = acm->writesize; tmp.baud_base =le32_to_cpu (acm->line.dwDTERate); + tmp.close_delay = acm->port.close_delay /10 ; + tmp.closing_wait = acm->port.closing_wait ==ASYNC_CLOSING_WAIT_NONE ? +ASYNC_CLOSING_WAIT_NONE : + acm->port.closing_wait /10 ;if (copy_to_user (info, &tmp,sizeof (tmp)))return -EFAULT ;
@@ -795,6 +799,37 @@ static int get_serial_info(struct acm *acm, struct serial_struct __user *info)return 0 ; } +static int set_serial_info (struct acm *acm, +struct serial_struct __user *newinfo) +{ +struct serial_struct new_serial; +unsigned int closing_wait, close_delay; +int retval =0 ; + +if (copy_from_user (&new_serial, newinfo,sizeof (new_serial))) +return -EFAULT ; + + close_delay = new_serial.close_delay *10 ; + closing_wait = new_serial.closing_wait ==ASYNC_CLOSING_WAIT_NONE ? +ASYNC_CLOSING_WAIT_NONE : new_serial.closing_wait *10 ; + +mutex_lock (&acm->port.mutex); + +if (!capable (CAP_SYS_ADMIN )) { +if ((close_delay != acm->port.close_delay) || + (closing_wait != acm->port.closing_wait)) + retval = -EPERM ; +else + retval = -EOPNOTSUPP ; + }else { + acm->port.close_delay = close_delay; + acm->port.closing_wait = closing_wait; + } + +mutex_unlock (&acm->port.mutex); +return retval; +} +static int acm_tty_ioctl (struct tty_struct *tty,unsigned int cmd,unsigned long arg) {
@@ -805,6 +840,9 @@ static int acm_tty_ioctl(struct tty_struct *tty,case TIOCGSERIAL :/* gets serial port data */ rv =get_serial_info (acm, (struct serial_struct __user *) arg);break ; +case TIOCSSERIAL : + rv =set_serial_info (acm, (struct serial_struct __user *) arg); +break ; }return rv;
drivers/usb/host/ohci-q.c +19 -0
@@ -1128,6 +1128,25 @@ dl_done_list (struct ohci_hcd *ohci)while (td) {struct td *td_next = td->next_dl_td; +struct ed *ed = td->ed; + +/* +* Some OHCI controllers (NVIDIA for sure, maybe others) +* occasionally forget to add TDs to the done queue. Since +* TDs for a given endpoint are always processed in order, +* if we find a TD on the donelist then all of its +* predecessors must be finished as well. +*/ +for (;;) { +struct td *td2; + + td2 = list_first_entry(&ed->td_list, struct td, + td_list); +if (td2 == td) +break ; +takeback_td (ohci, td2); + } +takeback_td (ohci, td); td = td_next; }
drivers/usb/host/xhci-pci.c +5 -2
@@ -29,6 +29,7 @@/* Device for a quirk */ #define PCI_VENDOR_ID_FRESCO_LOGIC 0x1b73#define PCI_DEVICE_ID_FRESCO_LOGIC_PDK 0x1000 +#define PCI_DEVICE_ID_FRESCO_LOGIC_FL1400 0x1400#define PCI_VENDOR_ID_ETRON 0x1b6f#define PCI_DEVICE_ID_ASROCK_P67 0x7023
@@ -58,8 +59,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)/* Look for vendor-specific quirks */ if (pdev->vendor ==PCI_VENDOR_ID_FRESCO_LOGIC && - pdev->device ==PCI_DEVICE_ID_FRESCO_LOGIC_PDK ) { -if (pdev->revision ==0x0 ) { + (pdev->device ==PCI_DEVICE_ID_FRESCO_LOGIC_PDK || + pdev->device ==PCI_DEVICE_ID_FRESCO_LOGIC_FL1400 )) { +if (pdev->device ==PCI_DEVICE_ID_FRESCO_LOGIC_PDK && + pdev->revision ==0x0 ) { xhci->quirks |=XHCI_RESET_EP_QUIRK ;xhci_dbg (xhci,"QUIRK: Fresco Logic xHC needs configure" " endpoint cmd after reset endpoint\n" );
drivers/usb/serial/cp210x.c +1 -0
@@ -120,6 +120,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x10C4, 0x8477) }, /* Balluff RFID */ { USB_DEVICE(0x10C4, 0x85EA) }, /* AC-Services IBUS-IF */ { USB_DEVICE(0x10C4, 0x85EB) }, /* AC-Services CIS-IBUS */ + { USB_DEVICE(0x10C4, 0x85F8) }, /* Virtenio Preon32 */ { USB_DEVICE(0x10C4, 0x8664) }, /* AC-Services CAN-IF */ { USB_DEVICE(0x10C4, 0x8665) }, /* AC-Services OBD-IF */ { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
drivers/usb/serial/ftdi_sio.c +2 -1
@@ -197,6 +197,7 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_THROTTLE_PID) }, { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_GATEWAY_PID) }, { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_GBM_PID) }, + { USB_DEVICE(NEWPORT_VID, NEWPORT_AGILIS_PID) }, { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_IOBOARD_PID) }, { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_MINI_IOBOARD_PID) }, { USB_DEVICE(FTDI_VID, FTDI_SPROG_II) },
@@ -1810,7 +1811,7 @@ static int ftdi_8u2232c_probe(struct usb_serial *serial)dbg ("%s" , __func__);if ((udev->manufacturer && !strcmp (udev->manufacturer,"CALAO Systems" )) || - (udev->product && !strcmp (udev->product,"BeagleBone/XDS100" ))) + (udev->product && !strcmp (udev->product,"BeagleBone/XDS100V2" )))return ftdi_jtag_probe (serial);return 0 ;
drivers/usb/serial/ftdi_sio_ids.h +6 -0
@@ -752,6 +752,12 @@#define TTI_VID 0x103E/* Vendor Id */ #define TTI_QL355P_PID 0x03E8/* TTi QL355P power supply */ +/* +* Newport Cooperation (www.newport.com) +*/ +#define NEWPORT_VID 0x104D +#define NEWPORT_AGILIS_PID 0x3000 +/* Interbiometrics USB I/O Board */ /* Developed for Interbiometrics by Rudolf Gugler */ #define INTERBIOMETRICS_VID 0x1209
drivers/usb/serial/option.c +25 -0
@@ -80,6 +80,7 @@ static void option_instat_callback(struct urb *urb);#define OPTION_PRODUCT_GTM380_MODEM 0x7201#define HUAWEI_VENDOR_ID 0x12D1 +#define HUAWEI_PRODUCT_E173 0x140C#define HUAWEI_PRODUCT_K4505 0x1464#define HUAWEI_PRODUCT_K3765 0x1465#define HUAWEI_PRODUCT_K4605 0x14C6
@@ -552,6 +553,8 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLX) }, { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GKE) }, { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff), + .driver_info = (kernel_ulong_t) &net_intf1_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff),
@@ -883,6 +886,10 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0126, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t)&net_intf5_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0128, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0135, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0136, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0137, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0139, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0142, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0143, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0144, 0xff, 0xff, 0xff) },
@@ -903,20 +910,34 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0165, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0167, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0189, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0191, 0xff, 0xff, 0xff), /* ZTE EuFi890 */ .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0196, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0197, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0199, 0xff, 0xff, 0xff), /* ZTE MF820S */ .driver_info = (kernel_ulong_t)&net_intf1_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0200, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0201, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0254, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0257, 0xff, 0xff, 0xff), /* ZTE MF821 */ .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0265, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0284, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0317, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0326, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0330, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0395, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0414, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0417, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1008, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1010, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1012, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1018, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1021, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t)&net_intf2_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1057, 0xff, 0xff, 0xff) },
@@ -1096,6 +1117,10 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1298, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1299, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1300, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1301, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1302, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1303, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1333, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1401, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t)&net_intf2_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1402, 0xff, 0xff, 0xff),
drivers/usb/storage/Kconfig +1 -1
@@ -203,7 +203,7 @@ config USB_STORAGE_ENE_UB6250 config USB_UAS tristate "USB Attached SCSI" - depends on USB && SCSI + depends on USB && SCSI && BROKEN help The USB Attached SCSI protocol is supported by some USB storage devices. It permits higher performance by supporting
include/linux/mempolicy.h +0 -16
@@ -137,16 +137,6 @@ static inline void mpol_cond_put(struct mempolicy *pol)__mpol_put (pol); } -extern struct mempolicy *__mpol_cond_copy (struct mempolicy *tompol, -struct mempolicy *frompol); -static inline struct mempolicy *mpol_cond_copy (struct mempolicy *tompol, -struct mempolicy *frompol) -{ -if (!frompol) -return frompol; -return __mpol_cond_copy (tompol, frompol); -} -extern struct mempolicy *__mpol_dup (struct mempolicy *pol);static inline struct mempolicy *mpol_dup (struct mempolicy *pol) {
@@ -270,12 +260,6 @@ static inline void mpol_cond_put(struct mempolicy *pol) { } -static inline struct mempolicy *mpol_cond_copy (struct mempolicy *to, -struct mempolicy *from) -{ -return from; -} -static inline void mpol_get (struct mempolicy *pol) { }
kernel/rcutree.c +7 -7
@@ -202,13 +202,13 @@ DEFINE_PER_CPU(struct rcu_dynticks, rcu_dynticks) = { .dynticks = ATOMIC_INIT(1), }; -static int blimit =10 ;/* Maximum callbacks per rcu_do_batch. */ -static int qhimark =10000 ;/* If this many pending, ignore blimit. */ -static int qlowmark =100 ;/* Once only this many pending, use blimit. */ +static long blimit =10 ;/* Maximum callbacks per rcu_do_batch. */ +static long qhimark =10000 ;/* If this many pending, ignore blimit. */ +static long qlowmark =100 ;/* Once only this many pending, use blimit. */ -module_param (blimit, int,0 ); -module_param (qhimark, int,0 ); -module_param (qlowmark, int,0 ); +module_param (blimit, long,0 ); +module_param (qhimark, long,0 ); +module_param (qlowmark, long,0 );int rcu_cpu_stall_suppress__read_mostly ;/* 1 = suppress stall warnings. */ int rcu_cpu_stall_timeout__read_mostly =CONFIG_RCU_CPU_STALL_TIMEOUT ;
@@ -1476,7 +1476,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp) {unsigned long flags;struct rcu_head *next, *list, **tail; -int bl, count, count_lazy; +long bl, count, count_lazy;/* If no callbacks are ready, just return.*/ if (!cpu_has_callbacks_ready_to_invoke (rdp)) {
kernel/trace/ftrace.c +1 -1
@@ -2368,7 +2368,7 @@ static void reset_iter_read(struct ftrace_iterator *iter) { iter->pos =0 ; iter->func_pos =0 ; - iter->flags &= ~(FTRACE_ITER_PRINTALL &FTRACE_ITER_HASH ); + iter->flags &= ~(FTRACE_ITER_PRINTALL |FTRACE_ITER_HASH ); }static void *t_start (struct seq_file *m,loff_t *pos)
kernel/workqueue.c +2 -2
@@ -1141,8 +1141,8 @@ int queue_delayed_work_on(int cpu, struct workqueue_struct *wq,if (!test_and_set_bit (WORK_STRUCT_PENDING_BIT ,work_data_bits (work))) {unsigned int lcpu; -BUG_ON (timer_pending (timer)); -BUG_ON (!list_empty (&work->entry)); +WARN_ON_ONCE (timer_pending (timer)); +WARN_ON_ONCE (!list_empty (&work->entry));timer_stats_timer_set_start_info (&dwork->timer);
mm/dmapool.c +7 -24
@@ -50,7 +50,6 @@ struct dma_pool { /* the pool */size_t allocation;size_t boundary;char name[32 ]; -wait_queue_head_t waitq;struct list_head pools; };
@@ -62,8 +61,6 @@ struct dma_page { /* cacheable header for 'allocation' bytes */unsigned int offset; }; -#define POOL_TIMEOUT_JIFFIES ((100 /* msec */ * HZ) / 1000) -static DEFINE_MUTEX (pools_lock); static ssize_t
@@ -172,7 +169,6 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev, retval->size = size; retval->boundary = boundary; retval->allocation = allocation; -init_waitqueue_head (&retval->waitq);if (dev) {int ret;
@@ -227,7 +223,6 @@ static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags)memset (page->vaddr,POOL_POISON_FREED , pool->allocation);#endif pool_initialise_page (pool, page); -list_add (&page->page_list, &pool->page_list); page->in_use =0 ; page->offset =0 ; }else {
@@ -315,30 +310,21 @@ void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags,might_sleep_if (mem_flags & __GFP_WAIT);spin_lock_irqsave (&pool->lock, flags); - restart:list_for_each_entry (page, &pool->page_list, page_list) {if (page->offset < pool->allocation) goto ready; } - page =pool_alloc_page (pool,GFP_ATOMIC ); -if (!page) { -if (mem_flags & __GFP_WAIT) { -DECLARE_WAITQUEUE (wait, current); -__set_current_state (TASK_UNINTERRUPTIBLE ); -__add_wait_queue (&pool->waitq, &wait); -spin_unlock_irqrestore (&pool->lock, flags); +/* pool_alloc_page() might sleep, so temporarily drop &pool->lock */ +spin_unlock_irqrestore (&pool->lock, flags); -schedule_timeout (POOL_TIMEOUT_JIFFIES ); + page =pool_alloc_page (pool, mem_flags); +if (!page) +return NULL ; -spin_lock_irqsave (&pool->lock, flags); -__remove_wait_queue (&pool->waitq, &wait); - goto restart; - } - retval =NULL ; - goto done; - } +spin_lock_irqsave (&pool->lock, flags); +list_add (&page->page_list, &pool->page_list); ready: page->in_use++; offset = page->offset;
@@ -348,7 +334,6 @@ void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags,#ifdef DMAPOOL_DEBUG memset (retval,POOL_POISON_ALLOCATED , pool->size);#endif - done:spin_unlock_irqrestore (&pool->lock, flags);return retval; }
@@ -435,8 +420,6 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma) page->in_use--; *(int *)vaddr = page->offset; page->offset = offset; -if (waitqueue_active (&pool->waitq)) -wake_up_locked (&pool->waitq);/* * Resist a temptation to do * if (!is_page_busy(page)) pool_free_page(pool, page);
mm/mempolicy.c +0 -22
@@ -2009,28 +2009,6 @@ struct mempolicy *__mpol_dup(struct mempolicy *old)return new; } -/* -* If *frompol needs [has] an extra ref, copy *frompol to *tompol , -* eliminate the * MPOL_F_* flags that require conditional ref and -* [NOTE!!!] drop the extra ref. Not safe to reference *frompol directly -* after return. Use the returned value. -* -* Allows use of a mempolicy for, e.g., multiple allocations with a single -* policy lookup, even if the policy needs/has extra ref on lookup. -* shmem_readahead needs this. -*/ -struct mempolicy *__mpol_cond_copy (struct mempolicy *tompol, -struct mempolicy *frompol) -{ -if (!mpol_needs_cond_ref (frompol)) -return frompol; - - *tompol = *frompol; - tompol->flags &= ~MPOL_F_SHARED ;/* copy doesn't need unref */ -__mpol_put (frompol); -return tompol; -} -/* Slow path of a mempolicy comparison */ bool __mpol_equal (struct mempolicy *a,struct mempolicy *b) {
mm/shmem.c +16 -10
@@ -798,24 +798,28 @@ static struct mempolicy *shmem_get_sbmpol(struct shmem_sb_info *sbinfo)static struct page *shmem_swapin (swp_entry_t swap,gfp_t gfp,struct shmem_inode_info *info,pgoff_t index) { -struct mempolicy mpol, *spol;struct vm_area_struct pvma; - - spol =mpol_cond_copy (&mpol, -mpol_shared_policy_lookup (&info->policy, index)); +struct page *page;/* Create a pseudo vma that just contains the policy */ pvma.vm_start =0 ; pvma.vm_pgoff = index; pvma.vm_ops =NULL ; - pvma.vm_policy = spol; -return swapin_readahead (swap, gfp, &pvma,0 ); + pvma.vm_policy =mpol_shared_policy_lookup (&info->policy, index); + + page =swapin_readahead (swap, gfp, &pvma,0 ); + +/* Drop reference taken by mpol_shared_policy_lookup() */ +mpol_cond_put (pvma.vm_policy); + +return page; }static struct page *shmem_alloc_page (gfp_t gfp,struct shmem_inode_info *info,pgoff_t index) {struct vm_area_struct pvma; +struct page *page;/* Create a pseudo vma that just contains the policy */ pvma.vm_start =0 ;
@@ -823,10 +827,12 @@ static struct page *shmem_alloc_page(gfp_t gfp, pvma.vm_ops =NULL ; pvma.vm_policy =mpol_shared_policy_lookup (&info->policy, index); -/* -* alloc_page_vma() will drop the shared policy reference -*/ - return alloc_page_vma(gfp, &pvma, 0); + page =alloc_page_vma (gfp, &pvma,0 ); + +/* Drop reference taken by mpol_shared_policy_lookup() */ +mpol_cond_put (pvma.vm_policy); + + return page; }#else /* !CONFIG_NUMA */ #ifdef CONFIG_TMPFS
sound/soc/Makefile +3 -2
@@ -1,8 +1,9 @@ snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o snd-soc-core-objs += soc-pcm.o soc-io.o -snd-soc-dmaengine-pcm-objs := soc-dmaengine-pcm.o -obj-$(CONFIG_SND_SOC_DMAENGINE_PCM) += snd-soc-dmaengine-pcm.o +ifneq ($(CONFIG_SND_SOC_DMAENGINE_PCM),) +snd-soc-core-objs += soc-dmaengine-pcm.o +endif obj-$(CONFIG_SND_SOC) += snd-soc-core.o obj-$(CONFIG_SND_SOC) += codecs/
tools/perf/builtin-test.c +12 -26
@@ -1154,19 +1154,13 @@ static int test__parse_events(void)return ret; } -static int sched__get_first_possible_cpu (pid_t pid,cpu_set_t **maskp, -size_t *sizep) +static int sched__get_first_possible_cpu (pid_t pid,cpu_set_t *maskp) { -cpu_set_t *mask; -size_t size;int i, cpu =-1 , nrcpus =1024 ; realloc: - mask =CPU_ALLOC (nrcpus); - size =CPU_ALLOC_SIZE (nrcpus); -CPU_ZERO_S (size, mask); +CPU_ZERO (maskp); -if (sched_getaffinity (pid, size, mask) ==-1 ) { -CPU_FREE (mask); +if (sched_getaffinity (pid,sizeof (*maskp), maskp) ==-1 ) {if (errno ==EINVAL && nrcpus < (1024 <<8 )) { nrcpus = nrcpus <<2 ; goto realloc;
@@ -1176,19 +1170,14 @@ realloc: }for (i =0 ; i < nrcpus; i++) { -if (CPU_ISSET_S (i, size, mask)) { -if (cpu ==-1 ) { +if (CPU_ISSET (i, maskp)) { +if (cpu ==-1 ) cpu = i; - *maskp = mask; - *sizep = size; - }else -CPU_CLR_S (i, size, mask); +else +CPU_CLR (i, maskp); } } -if (cpu ==-1 ) -CPU_FREE (mask); -return cpu; }
@@ -1199,8 +1188,8 @@ static int test__PERF_RECORD(void) .freq = 10, .mmap_pages = 256, }; -cpu_set_t *cpu_mask =NULL ; -size_t cpu_mask_size =0 ; +cpu_set_t cpu_mask; +size_t cpu_mask_size =sizeof (cpu_mask);struct perf_evlist *evlist =perf_evlist__new (NULL ,NULL );struct perf_evsel *evsel;struct perf_sample sample;
@@ -1265,8 +1254,7 @@ static int test__PERF_RECORD(void) evsel->attr.sample_type |=PERF_SAMPLE_TIME ;perf_evlist__config_attrs (evlist, &opts); - err =sched__get_first_possible_cpu (evlist->workload.pid, &cpu_mask, - &cpu_mask_size); + err =sched__get_first_possible_cpu (evlist->workload.pid, &cpu_mask);if (err <0 ) {pr_debug ("sched__get_first_possible_cpu: %s\n" ,strerror (errno)); goto out_delete_evlist;
@@ -1277,9 +1265,9 @@ static int test__PERF_RECORD(void)/* * So that we can check perf_sample.cpu on all the samples. */ -if (sched_setaffinity (evlist->workload.pid, cpu_mask_size, cpu_mask) <0 ) { +if (sched_setaffinity (evlist->workload.pid, cpu_mask_size, &cpu_mask) <0 ) {pr_debug ("sched_setaffinity: %s\n" ,strerror (errno)); - goto out_free_cpu_mask; + goto out_delete_evlist; }/*
@@ -1472,8 +1460,6 @@ found_exit: } out_err:perf_evlist__munmap (evlist); -out_free_cpu_mask: -CPU_FREE (cpu_mask); out_delete_evlist:perf_evlist__delete (evlist); out: