Linux 3.4.17
Greg KH
maintainerI'm announcing the release of the 3.4.17 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
------------
Documentation/devicetree/bindings/arm/atmel-at91.txt | 2 Makefile | 2 arch/arm/kernel/smp.c | 14 + arch/arm/mach-at91/at91rm9200_devices.c | 2 arch/arm/mach-at91/at91sam9260_devices.c | 2 arch/arm/mach-at91/at91sam9261_devices.c | 2 arch/arm/mach-at91/at91sam9263_devices.c | 2 arch/arm/mach-at91/at91sam9rl_devices.c | 2 arch/arm/mach-at91/setup.c | 2 arch/arm/mach-exynos/common.c | 5 arch/arm/mach-s3c24xx/s3c2416.c | 2 arch/arm/mach-s3c24xx/s3c2443.c | 4 arch/arm/mach-s5p64x0/common.c | 3 arch/arm/mach-s5pc100/common.c | 3 arch/arm/mach-s5pv210/common.c | 3 arch/arm/plat-samsung/include/plat/spi-core.h | 30 +++ arch/x86/include/asm/efi.h | 1 arch/x86/kernel/e820.c | 3 arch/x86/kernel/setup.c | 27 ++- arch/x86/mm/init.c | 69 ++++--- arch/x86/platform/efi/efi.c | 43 ++-- drivers/bcma/main.c | 5 drivers/cpufreq/powernow-k8.c | 9 - drivers/dma/imx-dma.c | 4 drivers/dma/sirf-dma.c | 4 drivers/gpu/drm/i915/intel_lvds.c | 8 drivers/gpu/drm/radeon/evergreen_cs.c | 1 drivers/hv/channel.c | 24 +- drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 164 +++++++++---------- drivers/rtc/rtc-imxdi.c | 2 drivers/staging/android/binder.c | 30 +++ drivers/staging/comedi/drivers/amplc_pc236.c | 2 drivers/usb/core/hub.c | 7 drivers/usb/host/pci-quirks.c | 9 - drivers/usb/host/xhci-ring.c | 11 + drivers/usb/serial/mos7840.c | 30 --- drivers/usb/serial/opticon.c | 11 + drivers/usb/serial/sierra.c | 26 ++- drivers/usb/serial/whiteheat.c | 1 drivers/usb/storage/unusual_devs.h | 6 drivers/vhost/net.c | 3 fs/compat_ioctl.c | 2 fs/exec.c | 3 fs/sysfs/dir.c | 16 - include/drm/drm_pciids.h | 3 include/linux/efi.h | 5 include/linux/memblock.h | 1 init/main.c | 3 lib/genalloc.c | 2 mm/memblock.c | 24 ++ mm/rmap.c | 20 +- net/bluetooth/smp.c | 6 net/mac80211/wpa.c | 3 net/sunrpc/xprtsock.c | 41 +--- sound/pci/hda/patch_realtek.c | 1 usr/gen_init_cpio.c | 43 ++-- 56 files changed, 468 insertions(+), 285 deletions(-)
Alex Deucher (2):
drm/radeon: add some new SI PCI ids drm/radeon: add error output if VM CS fails on cayman
Andreas Herrmann (1):
cpufreq / powernow-k8: Remove usage of smp_processor_id() in preemptible code
Anisse Astier (2):
ehci: fix Lucid nohandoff pci quirk to be more generic with BIOS versions
ehci: Add yet-another Lucid nohandoff pci quirk
Arve Hjønnevåg (2):
Staging: android: binder: Fix memory leak on thread/process exit
Staging: android: binder: Allow using highmem for binder buffers
Barry Song (2):
dmaengine: sirf: fix a typo in dma_prep_interleaved
dmaengine: sirf: fix a typo in moving running dma_desc to active queue
Bo Shen (1):
ARM: at91/i2c: change id to let i2c-gpio work
Felix Fietkau (1):
Revert "ath9k_hw: Updated AR9003 tx gain table for 5GHz"
Geert Uytterhoeven (1):
sysfs: sysfs_pathname/sysfs_add_one: Use strlcat() instead of strcat()
Greg Kroah-Hartman (1):
Linux 3.4.17
Heiko Stuebner (1):
ARM: SAMSUNG: Add naming of s3c64xx-spi devices
Ian Abbott (1):
staging: comedi: amplc_pc236: fix invalid register access during detach
Ivan Shugov (1):
ARM: at91: at91sam9g10: fix SOC type detection
Jacob Shin (1):
x86, mm: Find_early_table_space based on ranges that are actually being mapped
Jan Kara (1):
mm: fix XFS oops due to dirty pages without buffers on s390
Jan Luebbe (1):
drivers/rtc/rtc-imxdi.c: add missing spin lock initialization
Johan Hedberg (1):
Bluetooth: SMP: Fix setting unknown auth_req bits
Johan Hovold (9):
USB: whiteheat: fix memory leak in error path
USB: opticon: fix DMA from stack
USB: opticon: fix memory leak in error path
USB: sierra: fix memory leak in attach error path
USB: sierra: fix memory leak in probe error path
USB: mos7840: fix urb leak at release
USB: mos7840: fix port-device leak in error path
USB: mos7840: remove NULL-urb submission
USB: mos7840: remove invalid disconnect handling
Josh Triplett (1):
efi: Defer freeing boot services memory until after ACPI init
Josh Wu (1):
ARM: at91/tc: fix typo in the DT document
K. Y. Srinivasan (1):
Drivers: hv: Cleanup error handling in vmbus_open()
Kees Cook (2):
gen_init_cpio: avoid stack overflow when expanding fs/compat_ioctl.c: VIDEO_SET_SPU_PALETTE missing error check
Lennart Sorensen (1):
USB: serial: Fix memory leak in sierra_release()
Michael S. Tsirkin (1):
vhost: fix mergeable bufs on BE hosts
Michael Shigorin (1):
usb-storage: add unusual_devs entry for Casio EX-N1 digital camera
Octavian Purdila (1):
usb hub: send clear_tt_buffer_complete events when canceling TT clear work
Oleg Nesterov (1):
freezer: exec should clear PF_NOFREEZE along with PF_KTHREAD
Olof Johansson (1):
x86: efi: Turn off efi_enabled after setup on mixed fw/kernel
Piotr Haber (1):
bcma: fix unregistration of cores
Sarah Sharp (1):
xhci: Fix potential NULL ptr deref in command cancellation.
Sjoerd Simons (1):
drm/i915: no lvds quirk for Zotac ZDBOX SD ID12/ID13
Stanislaw Gruszka (1):
mac80211: check if key has TKIP type before updating IV
Stefán Freyr (1):
ALSA: hda - add dock support for Thinkpad T430
Thadeu Lima de Souza Cascardo (1):
genalloc: stop crashing the system when destroying a pool
Trond Myklebust (4):
SUNRPC: Get rid of the xs_error_report socket callback
SUNRPC: Clear the connect flag when socket state is TCP_CLOSE_WAIT Revert "SUNRPC: Ensure we close the socket on EPIPE errors too..."
SUNRPC: Prevent races in xs_abort_connection()
Wei Yongjun (1):
dmaengine: imx-dma: fix missing unlock on error in imxdma_xfer_desc()
Will Deacon (1):
ARM: 7559/1: smp: switch away from the idmap before updating init_mm.mm_count
Yinghai Lu (3):
x86, mm: Trim memory in memblock to be page aligned x86, mm: Undo incorrect revert in arch/x86/mm/init.c x86, mm: Use memblock memory loop instead of e820_RAM
Greg KH
maintainerDocumentation/devicetree/bindings/arm/atmel-at91.txt +1 -1
@@ -8,7 +8,7 @@ PIT Timer required properties: shared across all System Controller members. TC/TCLIB Timer required properties: -- compatible: Should be "atmel,<chip>-pit". +- compatible: Should be "atmel,<chip>-tcb". <chip> can be "at91rm9200" or "at91sam9x5" - reg: Should contain registers location and length - interrupts: Should contain all interrupts for the TC block
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 4 -SUBLEVEL = 16 +SUBLEVEL = 17 EXTRAVERSION = NAME = Saber-toothed Squirrel
arch/arm/kernel/smp.c +10 -4
@@ -249,18 +249,24 @@ static void percpu_timer_setup(void); asmlinkage void __cpuinit secondary_start_kernel(void) {struct mm_struct *mm = &init_mm; -unsigned int cpu =smp_processor_id (); +unsigned int cpu; + +/* +* The identity mapping is uncached (strongly ordered), so +* switch away from it before attempting any exclusive accesses. +*/ +cpu_switch_mm (mm->pgd, mm); +enter_lazy_tlb (mm, current); +local_flush_tlb_all ();/* * All kernel threads share the same mm context; grab a * reference and switch to it. */ + cpu =smp_processor_id ();atomic_inc (&mm->mm_count); current->active_mm = mm;cpumask_set_cpu (cpu,mm_cpumask (mm)); -cpu_switch_mm (mm->pgd, mm); -enter_lazy_tlb (mm, current); -local_flush_tlb_all ();printk ("CPU%u: Booted secondary processor\n" , cpu);
arch/arm/mach-at91/at91rm9200_devices.c +1 -1
@@ -463,7 +463,7 @@ static struct i2c_gpio_platform_data pdata = {static struct platform_device at91rm9200_twi_device = { .name ="i2c-gpio" , - .id =-1 , + .id =0 , .dev.platform_data = &pdata, };
arch/arm/mach-at91/at91sam9260_devices.c +1 -1
@@ -468,7 +468,7 @@ static struct i2c_gpio_platform_data pdata = {static struct platform_device at91sam9260_twi_device = { .name ="i2c-gpio" , - .id =-1 , + .id =0 , .dev.platform_data = &pdata, };
arch/arm/mach-at91/at91sam9261_devices.c +1 -1
@@ -285,7 +285,7 @@ static struct i2c_gpio_platform_data pdata = {static struct platform_device at91sam9261_twi_device = { .name ="i2c-gpio" , - .id =-1 , + .id =0 , .dev.platform_data = &pdata, };
arch/arm/mach-at91/at91sam9263_devices.c +1 -1
@@ -542,7 +542,7 @@ static struct i2c_gpio_platform_data pdata = {static struct platform_device at91sam9263_twi_device = { .name ="i2c-gpio" , - .id =-1 , + .id =0 , .dev.platform_data = &pdata, };
arch/arm/mach-at91/at91sam9rl_devices.c +1 -1
@@ -314,7 +314,7 @@ static struct i2c_gpio_platform_data pdata = {static struct platform_device at91sam9rl_twi_device = { .name ="i2c-gpio" , - .id =-1 , + .id =0 , .dev.platform_data = &pdata, };
arch/arm/mach-at91/setup.c +1 -1
@@ -146,7 +146,7 @@ static void __init soc_detect(u32 dbgu_base) }/* at91sam9g10 */ -if ((cidr & ~AT91_CIDR_EXT ) ==ARCH_ID_AT91SAM9G10 ) { +if ((socid & ~AT91_CIDR_EXT ) ==ARCH_ID_AT91SAM9G10 ) { at91_soc_initdata.type =AT91_SOC_SAM9G10 ; at91_boot_soc = at91sam9261_soc; }
arch/arm/mach-exynos/common.c +5 -0
@@ -44,6 +44,7 @@#include <plat/fimc-core.h> #include <plat/iic-core.h> #include <plat/tv-core.h> +#include <plat/spi-core.h> #include <plat/regs-serial.h> #include "common.h"
@@ -338,6 +339,8 @@ static void __init exynos4_map_io(void)s5p_fb_setname (0 ,"exynos4-fb" );s5p_hdmi_setname ("exynos4-hdmi" ); + +s3c64xx_spi_setname ("exynos4210-spi" ); }static void __init exynos5_map_io (void )
@@ -358,6 +361,8 @@ static void __init exynos5_map_io(void)s3c_i2c0_setname ("s3c2440-i2c" );s3c_i2c1_setname ("s3c2440-i2c" );s3c_i2c2_setname ("s3c2440-i2c" ); + +s3c64xx_spi_setname ("exynos4210-spi" ); }static void __init exynos4_init_clocks (int xtal)
arch/arm/mach-s3c24xx/s3c2416.c +2 -0
@@ -61,6 +61,7 @@#include <plat/nand-core.h> #include <plat/adc-core.h> #include <plat/rtc-core.h> +#include <plat/spi-core.h> static struct map_desc s3c2416_iodesc[]__initdata = {IODESC_ENT (WATCHDOG ),
@@ -131,6 +132,7 @@ void __init s3c2416_map_io(void)/* initialize device information early */ s3c2416_default_sdhci0 ();s3c2416_default_sdhci1 (); +s3c64xx_spi_setname ("s3c2443-spi" );iotable_init (s3c2416_iodesc,ARRAY_SIZE (s3c2416_iodesc)); }
arch/arm/mach-s3c24xx/s3c2443.c +4 -0
@@ -43,6 +43,7 @@#include <plat/nand-core.h> #include <plat/adc-core.h> #include <plat/rtc-core.h> +#include <plat/spi-core.h> static struct map_desc s3c2443_iodesc[]__initdata = {IODESC_ENT (WATCHDOG ),
@@ -100,6 +101,9 @@ void __init s3c2443_map_io(void) s3c24xx_gpiocfg_default.set_pull = s3c2443_gpio_setpull; s3c24xx_gpiocfg_default.get_pull = s3c2443_gpio_getpull; +/* initialize device information early */ +s3c64xx_spi_setname ("s3c2443-spi" ); +iotable_init (s3c2443_iodesc,ARRAY_SIZE (s3c2443_iodesc)); }
arch/arm/mach-s5p64x0/common.c +3 -0
@@ -44,6 +44,7 @@#include <plat/sdhci.h> #include <plat/adc-core.h> #include <plat/fb-core.h> +#include <plat/spi-core.h> #include <plat/gpio-cfg.h> #include <plat/regs-irqtype.h> #include <plat/regs-serial.h>
@@ -179,6 +180,7 @@ void __init s5p6440_map_io(void)/* initialize any device information early */ s3c_adc_setname ("s3c64xx-adc" );s3c_fb_setname ("s5p64x0-fb" ); +s3c64xx_spi_setname ("s5p64x0-spi" );s5p64x0_default_sdhci0 ();s5p64x0_default_sdhci1 ();
@@ -193,6 +195,7 @@ void __init s5p6450_map_io(void)/* initialize any device information early */ s3c_adc_setname ("s3c64xx-adc" );s3c_fb_setname ("s5p64x0-fb" ); +s3c64xx_spi_setname ("s5p64x0-spi" );s5p64x0_default_sdhci0 ();s5p64x0_default_sdhci1 ();
arch/arm/mach-s5pc100/common.c +3 -0
@@ -45,6 +45,7 @@#include <plat/fb-core.h> #include <plat/iic-core.h> #include <plat/onenand-core.h> +#include <plat/spi-core.h> #include <plat/regs-serial.h> #include <plat/watchdog-reset.h>
@@ -165,6 +166,8 @@ void __init s5pc100_map_io(void)s3c_onenand_setname ("s5pc100-onenand" );s3c_fb_setname ("s5pc100-fb" );s3c_cfcon_setname ("s5pc100-pata" ); + +s3c64xx_spi_setname ("s5pc100-spi" ); }void __init s5pc100_init_clocks (int xtal)
arch/arm/mach-s5pv210/common.c +3 -0
@@ -43,6 +43,7 @@#include <plat/iic-core.h> #include <plat/keypad-core.h> #include <plat/tv-core.h> +#include <plat/spi-core.h> #include <plat/regs-serial.h> #include "common.h"
@@ -196,6 +197,8 @@ void __init s5pv210_map_io(void)/* setup TV devices */ s5p_hdmi_setname ("s5pv210-hdmi" ); + +s3c64xx_spi_setname ("s5pv210-spi" ); }void __init s5pv210_init_clocks (int xtal)
arch/arm/plat-samsung/include/plat/spi-core.h new file +30 -0
@@ -0,0 +1,30 @@ +/* +* Copyright (C) 2012 Heiko Stuebner <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#ifndef __PLAT_S3C_SPI_CORE_H +#define __PLAT_S3C_SPI_CORE_H + +/* These functions are only for use with the core support code, such as +* the cpu specific initialisation code +*/ + +/* re-define device name depending on support. */ +static inline void s3c64xx_spi_setname (char *name) +{ +#ifdef CONFIG_S3C64XX_DEV_SPI0 + s3c64xx_device_spi0.name = name; +#endif +#ifdef CONFIG_S3C64XX_DEV_SPI1 + s3c64xx_device_spi1.name = name; +#endif +#ifdef CONFIG_S3C64XX_DEV_SPI2 + s3c64xx_device_spi2.name = name; +#endif +} + +#endif /* __PLAT_S3C_SPI_CORE_H */
arch/x86/include/asm/efi.h +1 -0
@@ -98,6 +98,7 @@ extern void efi_set_executable(efi_memory_desc_t *md, bool executable);extern int efi_memblock_x86_reserve_range (void );extern void efi_call_phys_prelog (void );extern void efi_call_phys_epilog (void ); +extern void efi_unmap_memmap (void );#ifndef CONFIG_EFI /*
arch/x86/kernel/e820.c +3 -0
@@ -1076,6 +1076,9 @@ void __init memblock_x86_fill(void)memblock_add (ei->addr, ei->size); } +/* throw away partial pages */ +memblock_trim_memory (PAGE_SIZE ); +memblock_dump_all (); }
arch/x86/kernel/setup.c +20 -7
@@ -928,18 +928,19 @@ void __init setup_arch(char **cmdline_p)#ifdef CONFIG_X86_64 if (max_pfn > max_low_pfn) {int i; -for (i =0 ; i < e820.nr_map; i++) { -struct e820entry *ei = &e820.map[i]; +unsigned long start, end; +unsigned long start_pfn, end_pfn; -if (ei->addr + ei->size <=1UL <<32 ) -continue ; +for_each_mem_pfn_range (i,MAX_NUMNODES , &start_pfn, &end_pfn, +NULL ) { -if (ei->type ==E820_RESERVED ) + end =PFN_PHYS (end_pfn); +if (end <= (1UL <<32 ))continue ; + start =PFN_PHYS (start_pfn); max_pfn_mapped =init_memory_mapping ( - ei->addr <1UL <<32 ?1UL <<32 : ei->addr, - ei->addr + ei->size); +max ((1UL <<32 ), start), end); }/* can we preseve max_low_pfn ?*/
@@ -1053,6 +1054,18 @@ void __init setup_arch(char **cmdline_p)mcheck_init ();arch_init_ideal_nops (); + +#ifdef CONFIG_EFI +/* Once setup is done above, disable efi_enabled on mismatched +* firmware/kernel archtectures since there is no support for +* runtime services. +*/ +if (efi_enabled &&IS_ENABLED (CONFIG_X86_64 ) != efi_64bit) { +pr_info ("efi: Setup done, disabling due to 32/64-bit mismatch\n" ); +efi_unmap_memmap (); + efi_enabled =0 ; + } +#endif }#ifdef CONFIG_X86_32
arch/x86/mm/init.c +39 -30
102 lines not on this page · raw message
arch/x86/platform/efi/efi.c +25 -18
108 lines not on this page · raw message
drivers/bcma/main.c +3 -2
@@ -131,9 +131,10 @@ static int bcma_register_cores(struct bcma_bus *bus)static void bcma_unregister_cores (struct bcma_bus *bus) { -struct bcma_device *core; +struct bcma_device *core, *tmp; -list_for_each_entry (core, &bus->cores, list) { +list_for_each_entry_safe (core, tmp, &bus->cores, list) { +list_del (&core->list);if (core->dev_registered)device_unregister (&core->dev); }
drivers/cpufreq/powernow-k8.c +1 -8
@@ -1223,14 +1223,7 @@ static int powernowk8_target(struct cpufreq_policy *pol,struct powernowk8_target_arg pta = { .pol = pol, .targfreq = targfreq, .relation = relation }; -/* -* Must run on @pol->cpu. cpufreq core is responsible for ensuring -* that we're bound to the current CPU and pol->cpu stays online. -*/ -if (smp_processor_id () == pol->cpu) -return powernowk8_target_fn (&pta); -else -return work_on_cpu (pol->cpu, powernowk8_target_fn, &pta); +return work_on_cpu (pol->cpu, powernowk8_target_fn, &pta); }/* Driver entry point to verify the policy and range of frequencies */
drivers/dma/imx-dma.c +3 -1
@@ -473,8 +473,10 @@ static int imxdma_xfer_desc(struct imxdma_desc *d) slot = i;break ; } -if (slot <0 ) +if (slot <0 ) { +spin_unlock_irqrestore (&imxdma->lock, flags);return -EBUSY ; + } imxdma->slots_2d[slot].xsr = d->x; imxdma->slots_2d[slot].ysr = d->y;
drivers/dma/sirf-dma.c +2 -2
@@ -109,7 +109,7 @@ static void sirfsoc_dma_execute(struct sirfsoc_dma_chan *schan) sdesc = list_first_entry(&schan->queued, struct sirfsoc_dma_desc, node);/* Move the first queued descriptor to active list */ -list_move_tail (&schan->queued, &schan->active); +list_move_tail (&sdesc->node, &schan->active);/* Start the DMA transfer */ writel_relaxed(sdesc->width, sdma->base + SIRFSOC_DMA_WIDTH_0 +
@@ -428,7 +428,7 @@ static struct dma_async_tx_descriptor *sirfsoc_dma_prep_interleaved(unsigned long iflags;int ret; -if ((xt->dir !=DMA_MEM_TO_DEV ) || (xt->dir !=DMA_DEV_TO_MEM )) { +if ((xt->dir !=DMA_MEM_TO_DEV ) && (xt->dir !=DMA_DEV_TO_MEM )) { ret = -EINVAL ; goto err_dir; }
drivers/gpu/drm/i915/intel_lvds.c +8 -0
@@ -777,6 +777,14 @@ static const struct dmi_system_id intel_no_lvds[] = { DMI_MATCH(DMI_BOARD_NAME, "MS-7469"), }, }, + { + .callback = intel_no_lvds_dmi_callback, + .ident = "ZOTAC ZBOXSD-ID12/ID13", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "ZOTAC"), + DMI_MATCH(DMI_BOARD_NAME, "ZBOXSD-ID12/ID13"), + }, + }, { }/* terminating entry */ };
drivers/gpu/drm/radeon/evergreen_cs.c +1 -0
@@ -2775,6 +2775,7 @@ static bool evergreen_vm_reg_valid(u32 reg)case CAYMAN_SQ_EX_ALLOC_TABLE_SLOTS :return true;default : +DRM_ERROR ("Invalid register 0x%x in CS\n" , reg);return false; } }
drivers/hv/channel.c +13 -11
@@ -146,14 +146,14 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,if (ret !=0 ) { err = ret; - goto errorout; + goto error0; } ret =hv_ringbuffer_init ( &newchannel->inbound, in, recv_ringbuffer_size);if (ret !=0 ) { err = ret; - goto errorout; + goto error0; }
@@ -168,7 +168,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,if (ret !=0 ) { err = ret; - goto errorout; + goto error0; }/* Create and init the channel open message */
@@ -177,7 +177,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size, GFP_KERNEL);if (!open_info) { err = -ENOMEM ; - goto errorout; + goto error0; }init_completion (&open_info->waitevent);
@@ -193,7 +193,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,if (userdatalen >MAX_USER_DEFINED_BYTES ) { err = -EINVAL ; - goto errorout; + goto error0; }if (userdatalen)
@@ -208,19 +208,18 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size, sizeof(struct vmbus_channel_open_channel));if (ret !=0 ) - goto cleanup; + goto error1; t =wait_for_completion_timeout (&open_info->waitevent,5 *HZ );if (t ==0 ) { err = -ETIMEDOUT ; - goto errorout; + goto error1; }if (open_info->response.open_result.status) err = open_info->response.open_result.status; -cleanup:spin_lock_irqsave (&vmbus_connection.channelmsg_lock, flags);list_del (&open_info->msglistentry);spin_unlock_irqrestore (&vmbus_connection.channelmsg_lock, flags);
@@ -228,9 +227,12 @@ cleanup:kfree (open_info);return err; -errorout: -hv_ringbuffer_cleanup (&newchannel->outbound); -hv_ringbuffer_cleanup (&newchannel->inbound); +error1: +spin_lock_irqsave (&vmbus_connection.channelmsg_lock, flags); +list_del (&open_info->msglistentry); +spin_unlock_irqrestore (&vmbus_connection.channelmsg_lock, flags); + +error0:free_pages ((unsigned long )out,get_order (send_ringbuffer_size + recv_ringbuffer_size));kfree (open_info);
drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h +82 -82
189 lines not on this page · raw message
drivers/rtc/rtc-imxdi.c +2 -0
@@ -392,6 +392,8 @@ static int dryice_rtc_probe(struct platform_device *pdev)if (imxdi->ioaddr ==NULL )return -ENOMEM ; +spin_lock_init (&imxdi->irq_lock); + imxdi->irq =platform_get_irq (pdev,0 );if (imxdi->irq <0 )return imxdi->irq;
drivers/staging/android/binder.c +28 -2
@@ -655,7 +655,7 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate, page = &proc->pages[(page_addr - proc->buffer) /PAGE_SIZE ];BUG_ON (*page); - *page =alloc_page (GFP_KERNEL | __GFP_ZERO); + *page =alloc_page (GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO);if (*page ==NULL ) {printk (KERN_ERR "binder: %d: binder_alloc_buf failed " "for page at %p\n" , proc->pid, page_addr);
@@ -2507,14 +2507,38 @@ static void binder_release_work(struct list_head *list)struct binder_transaction *t; t = container_of(w, struct binder_transaction, work); -if (t->buffer->target_node && !(t->flags &TF_ONE_WAY )) +if (t->buffer->target_node && + !(t->flags &TF_ONE_WAY )) {binder_send_failed_reply (t,BR_DEAD_REPLY ); + }else { +binder_debug (BINDER_DEBUG_DEAD_TRANSACTION , +"binder: undelivered transaction %d\n" , + t->debug_id); + t->buffer->transaction =NULL ; +kfree (t); +binder_stats_deleted (BINDER_STAT_TRANSACTION ); + } }break ;case BINDER_WORK_TRANSACTION_COMPLETE : { +binder_debug (BINDER_DEBUG_DEAD_TRANSACTION , +"binder: undelivered TRANSACTION_COMPLETE\n" );kfree (w);binder_stats_deleted (BINDER_STAT_TRANSACTION_COMPLETE ); }break ; +case BINDER_WORK_DEAD_BINDER_AND_CLEAR : +case BINDER_WORK_CLEAR_DEATH_NOTIFICATION : { +struct binder_ref_death *death; + + death = container_of(w, struct binder_ref_death, work); +binder_debug (BINDER_DEBUG_DEAD_TRANSACTION , +"binder: undelivered death notification, %p\n" , + death->cookie); +kfree (death); +binder_stats_deleted (BINDER_STAT_DEATH ); + }break ;default : +pr_err ("binder: unexpected work type, %d, not freed\n" , + w->type);break ; } }
@@ -2984,6 +3008,7 @@ static void binder_deferred_release(struct binder_proc *proc) nodes++;rb_erase (&node->rb_node, &proc->nodes);list_del_init (&node->work.entry); +binder_release_work (&node->async_todo);if (hlist_empty (&node->refs)) {kfree (node);binder_stats_deleted (BINDER_STAT_NODE );
@@ -3022,6 +3047,7 @@ static void binder_deferred_release(struct binder_proc *proc)binder_delete_ref (ref); }binder_release_work (&proc->todo); +binder_release_work (&proc->delivered_death); buffers =0 ;while ((n =rb_first (&proc->allocated_buffers))) {
drivers/staging/comedi/drivers/amplc_pc236.c +1 -1
@@ -468,7 +468,7 @@ static int pc236_detach(struct comedi_device *dev) {printk (KERN_DEBUG "comedi%d: %s: detach\n" , dev->minor,PC236_DRIVER_NAME ); -if (devpriv) +if (dev->iobase)pc236_intr_disable (dev);if (dev->irq)
drivers/usb/core/hub.c +5 -2
@@ -507,13 +507,16 @@ static void hub_tt_work(struct work_struct *work)int limit =100 ;spin_lock_irqsave (&hub->tt.lock, flags); -while (--limit && !list_empty (&hub->tt.clear_list)) { +while (!list_empty (&hub->tt.clear_list)) {struct list_head *next;struct usb_tt_clear *clear;struct usb_device *hdev = hub->hdev;const struct hc_driver *drv;int status; +if (!hub->quiescing && --limit <0 ) +break ; + next = hub->tt.clear_list.next; clear = list_entry (next, struct usb_tt_clear, clear_list);list_del (&clear->clear_list);
@@ -978,7 +981,7 @@ static void hub_quiesce(struct usb_hub *hub, enum hub_quiescing_type type)if (hub->has_indicators)cancel_delayed_work_sync (&hub->leds);if (hub->tt.hub) -cancel_work_sync (&hub->tt.clear_work); +flush_work_sync (&hub->tt.clear_work); }/* caller has locked the hub device */
drivers/usb/host/pci-quirks.c +8 -1
@@ -545,7 +545,14 @@ static const struct dmi_system_id __devinitconst ehci_dmi_nohandoff_table[] = {/* Pegatron Lucid (Ordissimo AIRIS) */ .matches = {DMI_MATCH (DMI_BOARD_NAME ,"M11JB" ), - DMI_MATCH(DMI_BIOS_VERSION, "Lucid-GE-133"), + DMI_MATCH(DMI_BIOS_VERSION, "Lucid-"), + }, + }, + { +/* Pegatron Lucid (Ordissimo) */ + .matches = { +DMI_MATCH (DMI_BOARD_NAME ,"Ordissimo" ), + DMI_MATCH(DMI_BIOS_VERSION, "Lucid-"), }, }, { }
drivers/usb/host/xhci-ring.c +11 -0
@@ -1228,6 +1228,17 @@ static void xhci_cmd_to_noop(struct xhci_hcd *xhci, struct xhci_cd *cur_cd) cur_seg =find_trb_seg (xhci->cmd_ring->first_seg, xhci->cmd_ring->dequeue, &cycle_state); +if (!cur_seg) { +xhci_warn (xhci,"Command ring mismatch, dequeue = %p %llx (dma)\n" , + xhci->cmd_ring->dequeue, + (unsigned long long ) +xhci_trb_virt_to_dma (xhci->cmd_ring->deq_seg, + xhci->cmd_ring->dequeue)); +xhci_debug_ring (xhci, xhci->cmd_ring); +xhci_dbg_ring_ptrs (xhci, xhci->cmd_ring); +return ; + } +/* find the command trb matched by cd from command ring */ for (cmd_trb = xhci->cmd_ring->dequeue; cmd_trb != xhci->cmd_ring->enqueue;
drivers/usb/serial/mos7840.c +3 -27
@@ -235,12 +235,10 @@ struct moschip_port {int port_num;/*Actual port number in the device(1,2,etc) */ struct urb *write_urb;/* write URB for this port */ struct urb *read_urb;/* read URB for this port */ -struct urb *int_urb;__u8 shadowLCR;/* last LCR value received */ __u8 shadowMCR;/* last MCR value received */ char open;char open_ports; -char zombie;wait_queue_head_t wait_chase;/* for handling sleeping while waiting for chase to finish */ wait_queue_head_t delta_msr_wait;/* for handling sleeping while waiting for msr change to happen */ int delta_msr_cond;
@@ -505,7 +503,6 @@ static void mos7840_control_callback(struct urb *urb)unsigned char *data;struct moschip_port *mos7840_port;__u8 regval =0x0 ; -int result =0 ;int status = urb->status; mos7840_port = urb->context;
@@ -524,7 +521,7 @@ static void mos7840_control_callback(struct urb *urb)default :dbg ("%s - nonzero urb status received: %d" , __func__, status); - goto exit; +return ; }dbg ("%s urb buffer size is %d" , __func__, urb->actual_length);
@@ -537,17 +534,6 @@ static void mos7840_control_callback(struct urb *urb)mos7840_handle_new_msr (mos7840_port, regval); else if (mos7840_port->MsrLsr == 1) mos7840_handle_new_lsr(mos7840_port, regval); - -exit: -spin_lock (&mos7840_port->pool_lock); -if (!mos7840_port->zombie) - result =usb_submit_urb (mos7840_port->int_urb,GFP_ATOMIC ); -spin_unlock (&mos7840_port->pool_lock); -if (result) { -dev_err (&urb->dev->dev, -"%s - Error %d submitting interrupt urb\n" , - __func__, result); - } } static int mos7840_get_reg(struct moschip_port *mcs, __u16 Wval, __u16 reg,
@@ -655,14 +641,7 @@ static void mos7840_interrupt_callback(struct urb *urb) wreg =MODEM_STATUS_REGISTER ;break ; } -spin_lock (&mos7840_port->pool_lock); -if (!mos7840_port->zombie) { - rv =mos7840_get_reg (mos7840_port, wval, wreg, &Data); - }else { -spin_unlock (&mos7840_port->pool_lock); -return ; - } -spin_unlock (&mos7840_port->pool_lock); + rv =mos7840_get_reg (mos7840_port, wval, wreg, &Data); } } }
@@ -2590,7 +2569,6 @@ error:kfree (mos7840_port->ctrl_buf);usb_free_urb (mos7840_port->control_urb);kfree (mos7840_port); - serial->port[i] =NULL ; }return status; }
@@ -2621,9 +2599,6 @@ static void mos7840_disconnect(struct usb_serial *serial) mos7840_port =mos7840_get_port_private (serial->port[i]);dbg ("mos7840_port %d = %p" , i, mos7840_port);if (mos7840_port) { -spin_lock_irqsave (&mos7840_port->pool_lock, flags); - mos7840_port->zombie =1 ; -spin_unlock_irqrestore (&mos7840_port->pool_lock, flags);usb_kill_urb (mos7840_port->control_urb); } }
@@ -2657,6 +2632,7 @@ static void mos7840_release(struct usb_serial *serial) mos7840_port =mos7840_get_port_private (serial->port[i]);dbg ("mos7840_port %d = %p" , i, mos7840_port);if (mos7840_port) { +usb_free_urb (mos7840_port->control_urb);kfree (mos7840_port->ctrl_buf);kfree (mos7840_port->dr);kfree (mos7840_port);
drivers/usb/serial/opticon.c +9 -2
@@ -160,7 +160,11 @@ static int send_control_msg(struct usb_serial_port *port, u8 requesttype, {struct usb_serial *serial = port->serial;int retval; -u8 buffer[2 ]; +u8 *buffer; + + buffer =kzalloc (1 ,GFP_KERNEL ); +if (!buffer) +return -ENOMEM ; buffer[0 ] = val;/* Send the message to the vendor control endpoint
@@ -169,6 +173,7 @@ static int send_control_msg(struct usb_serial_port *port, u8 requesttype, requesttype,USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_INTERFACE , 0, 0, buffer, 1, 0); +kfree (buffer);return retval; }
@@ -292,7 +297,7 @@ static int opticon_write(struct tty_struct *tty, struct usb_serial_port *port,if (!dr) {dev_err (&port->dev,"out of memory\n" ); count = -ENOMEM ; - goto error; + goto error_no_dr; } dr->bRequestType =USB_TYPE_VENDOR |USB_RECIP_INTERFACE |USB_DIR_OUT ;
@@ -322,6 +327,8 @@ static int opticon_write(struct tty_struct *tty, struct usb_serial_port *port,return count; error: +kfree (dr); +error_no_dr:usb_free_urb (urb); error_no_urb:kfree (buffer);
drivers/usb/serial/sierra.c +19 -7
@@ -171,7 +171,6 @@ static int sierra_probe(struct usb_serial *serial, {int result =0 ;struct usb_device *udev; -struct sierra_intf_private *data;u8 ifnum; udev = serial->dev;
@@ -199,11 +198,6 @@ static int sierra_probe(struct usb_serial *serial,return -ENODEV ; } - data = serial->private =kzalloc (sizeof (struct sierra_intf_private ),GFP_KERNEL ); -if (!data) -return -ENOMEM ; -spin_lock_init (&data->susp_lock); -return result; }
@@ -914,6 +908,7 @@ static void sierra_dtr_rts(struct usb_serial_port *port, int on)static int sierra_startup (struct usb_serial *serial) {struct usb_serial_port *port; +struct sierra_intf_private *intfdata;struct sierra_port_private *portdata;struct sierra_iface_info *himemoryp =NULL ;int i;
@@ -921,6 +916,14 @@ static int sierra_startup(struct usb_serial *serial)dev_dbg (&serial->dev->dev,"%s\n" , __func__); + intfdata =kzalloc (sizeof (*intfdata),GFP_KERNEL ); +if (!intfdata) +return -ENOMEM ; + +spin_lock_init (&intfdata->susp_lock); + +usb_set_serial_data (serial, intfdata); +/* Set Device mode to D0 */ sierra_set_power_state (serial->dev,0x0000 );
@@ -936,7 +939,7 @@ static int sierra_startup(struct usb_serial *serial)dev_dbg (&port->dev,"%s: kmalloc for " "sierra_port_private (%d) failed!\n" , __func__, i); -return -ENOMEM ; + goto err; }spin_lock_init (&portdata->lock);init_usb_anchor (&portdata->active);
@@ -973,6 +976,14 @@ static int sierra_startup(struct usb_serial *serial) }return 0 ; +err: +for (--i; i >=0 ; --i) { + portdata =usb_get_serial_port_data (serial->port[i]); +kfree (portdata); + } +kfree (intfdata); + +return -ENOMEM ; }static void sierra_release (struct usb_serial *serial)
@@ -992,6 +1003,7 @@ static void sierra_release(struct usb_serial *serial)continue ;kfree (portdata); } +kfree (serial->private); }#ifdef CONFIG_PM
drivers/usb/serial/whiteheat.c +1 -0
@@ -525,6 +525,7 @@ no_firmware:"%s: please contact [email protected]\n" , serial->type->description);kfree (result); +kfree (command);return -ENODEV ; no_command_private:
drivers/usb/storage/unusual_devs.h +6 -0
@@ -1004,6 +1004,12 @@ UNUSUAL_DEV( 0x07cf, 0x1001, 0x1000, 0x9999, USB_SC_8070, USB_PR_CB, NULL, US_FL_NEED_OVERRIDE | US_FL_FIX_INQUIRY ), +/* Submitted by Oleksandr Chumachenko <[email protected]> */ +UNUSUAL_DEV (0x07cf ,0x1167 ,0x0100 ,0x0100 , +"Casio" , +"EX-N1 DigitalCamera" , +USB_SC_8070 ,USB_PR_DEVICE ,NULL ,0 ), +/* Submitted by Hartmut Wahl <[email protected]>*/ UNUSUAL_DEV( 0x0839, 0x000a, 0x0001, 0x0001, "Samsung",
drivers/vhost/net.c +2 -1
@@ -376,7 +376,8 @@ static void handle_rx(struct vhost_net *net) .hdr.gso_type = VIRTIO_NET_HDR_GSO_NONE };size_t total_len =0 ; -int err, headcount, mergeable; +int err, mergeable; +s16 headcount;size_t vhost_hlen, sock_hlen;size_t vhost_len, sock_len;/* TODO: check that we are running from vhost_worker? */
fs/compat_ioctl.c +2 -0
@@ -210,6 +210,8 @@ static int do_video_set_spu_palette(unsigned int fd, unsigned int cmd, err =get_user (palp, &up->palette); err |=get_user (length, &up->length); +if (err) +return -EFAULT ; up_native =compat_alloc_user_space (sizeof (struct video_spu_palette )); err =put_user (compat_ptr (palp), &up_native->palette);
fs/exec.c +2 -1
@@ -1114,7 +1114,8 @@ int flush_old_exec(struct linux_binprm * bprm) bprm->mm =NULL ;/* We're using it now */ set_fs (USER_DS ); - current->flags &= ~(PF_RANDOMIZE |PF_FORKNOEXEC |PF_KTHREAD ); + current->flags &= + ~(PF_RANDOMIZE |PF_FORKNOEXEC |PF_KTHREAD |PF_NOFREEZE );flush_thread (); current->personality &= ~bprm->per_clear;
fs/sysfs/dir.c +8 -8
@@ -457,20 +457,18 @@ int __sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd)/** * sysfs_pathname - return full path to sysfs dirent * @sd: sysfs_dirent whose path we want -* @path: caller allocated buffer +* @path: caller allocated buffer of size PATH_MAX * * Gives the name "/" to the sysfs_root entry; any path returned * is relative to wherever sysfs is mounted. -* -* XXX: does no error checking on @path size */ static char *sysfs_pathname (struct sysfs_dirent *sd,char *path) {if (sd->s_parent) {sysfs_pathname (sd->s_parent, path); -strcat (path,"/" ); +strlcat (path,"/" ,PATH_MAX ); } -strcat (path, sd->s_name); +strlcat (path, sd->s_name,PATH_MAX );return path; }
@@ -503,9 +501,11 @@ int sysfs_add_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd)char *path =kzalloc (PATH_MAX ,GFP_KERNEL );WARN (1 ,KERN_WARNING "sysfs: cannot create duplicate filename '%s'\n" , - (path ==NULL ) ? sd->s_name : -strcat (strcat (sysfs_pathname (acxt->parent_sd, path),"/" ), - sd->s_name)); + (path ==NULL ) ? sd->s_name + : (sysfs_pathname (acxt->parent_sd, path), +strlcat (path,"/" ,PATH_MAX ), +strlcat (path, sd->s_name,PATH_MAX ), + path));kfree (path); }
include/drm/drm_pciids.h +3 -0
@@ -209,6 +209,8 @@ {0x1002, 0x6788, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \ {0x1002, 0x678A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6790, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6791, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6792, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6798, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6799, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \ {0x1002, 0x679A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI|RADEON_NEW_MEMMAP}, \
@@ -221,6 +223,7 @@ {0x1002, 0x6808, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6809, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6810, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6811, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6816, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6817, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6818, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \
include/linux/efi.h +5 -0
@@ -496,6 +496,11 @@ extern void efi_map_pal_code (void);extern void efi_memmap_walk (efi_freemem_callback_t callback,void *arg);extern void efi_gettimeofday (struct timespec *ts);extern void efi_enter_virtual_mode (void );/* switch EFI to virtual mode, if possible */ +#ifdef CONFIG_X86 +extern void efi_free_boot_services (void ); +#else +static inline void efi_free_boot_services (void ) {} +#endif extern u64 efi_get_iobase (void );extern u32 efi_mem_type (unsigned long phys_addr);extern u64 efi_mem_attributes (unsigned long phys_addr);
include/linux/memblock.h +1 -0
@@ -57,6 +57,7 @@ int memblock_add(phys_addr_t base, phys_addr_t size);int memblock_remove (phys_addr_t base,phys_addr_t size);int memblock_free (phys_addr_t base,phys_addr_t size);int memblock_reserve (phys_addr_t base,phys_addr_t size); +void memblock_trim_memory (phys_addr_t align);#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn,
init/main.c +3 -0
@@ -630,6 +630,9 @@ asmlinkage void __init start_kernel(void)acpi_early_init ();/* before LAPIC and SMP init */ sfi_init_late (); +if (efi_enabled) +efi_free_boot_services (); +ftrace_init ();/* Do the rest non-__init'ed, we're now alive */
lib/genalloc.c +1 -1
@@ -176,7 +176,7 @@ int gen_pool_add_virt(struct gen_pool *pool, unsigned long virt, phys_addr_t phystruct gen_pool_chunk *chunk;int nbits = size >> pool->min_alloc_order;int nbytes =sizeof (struct gen_pool_chunk ) + - (nbits +BITS_PER_BYTE -1 ) /BITS_PER_BYTE ; +BITS_TO_LONGS (nbits) *sizeof (long ); chunk =kmalloc_node (nbytes,GFP_KERNEL | __GFP_ZERO, nid);if (unlikely (chunk ==NULL ))
mm/memblock.c +24 -0
@@ -908,6 +908,30 @@ int __init_memblock memblock_is_region_reserved(phys_addr_t base, phys_addr_t sireturn memblock_overlaps_region (&memblock.reserved, base, size) >=0 ; } +void __init_memblock memblock_trim_memory(phys_addr_t align) +{ +int i; +phys_addr_t start, end, orig_start, orig_end; +struct memblock_type *mem = &memblock.memory; + +for (i =0 ; i < mem->cnt; i++) { + orig_start = mem->regions[i].base; + orig_end = mem->regions[i].base + mem->regions[i].size; + start =round_up (orig_start, align); + end =round_down (orig_end, align); + +if (start == orig_start && end == orig_end) +continue ; + +if (start < end) { + mem->regions[i].base = start; + mem->regions[i].size = end - start; + }else { +memblock_remove_region (mem, i); + i--; + } + } +} void __init_memblock memblock_set_current_limit(phys_addr_t limit) {
mm/rmap.c +15 -5
@@ -56,6 +56,7 @@#include <linux/mmu_notifier.h> #include <linux/migrate.h> #include <linux/hugetlb.h> +#include <linux/backing-dev.h> #include <asm/tlbflush.h>
@@ -977,11 +978,8 @@ int page_mkclean(struct page *page)if (page_mapped (page)) {struct address_space *mapping =page_mapping (page); -if (mapping) { +if (mapping) ret =page_mkclean_file (mapping, page); -if (page_test_and_clear_dirty (page_to_pfn (page),1 )) - ret =1 ; - } }return ret;
@@ -1167,6 +1165,7 @@ void page_add_file_rmap(struct page *page)*/ void page_remove_rmap (struct page *page) { +struct address_space *mapping =page_mapping (page);bool anon =PageAnon (page);bool locked;unsigned long flags;
@@ -1189,8 +1188,19 @@ void page_remove_rmap(struct page *page)* this if the page is anon, so about to be freed; but perhaps * not if it's in swapcache - there might be another pte slot * containing the swap entry, but page not yet written to swap. +* +* And we can skip it on file pages, so long as the filesystem +* participates in dirty tracking; but need to catch shm and tmpfs +* and ramfs pages which have been modified since creation by read +* fault. +* +* Note that mapping must be decided above, before decrementing +* mapcount (which luckily provides a barrier): once page is unmapped, +* it could be truncated and page->mapping reset to NULL at any moment. +* Note also that we are relying on page_mapping(page) to set mapping +* to &swapper_space when PageSwapCache(page). */ -if ((!anon ||PageSwapCache (page)) && +if (mapping && !mapping_cap_account_dirty (mapping) &&page_test_and_clear_dirty (page_to_pfn (page),1 ))set_page_dirty (page);/*
net/bluetooth/smp.c +4 -2
@@ -31,6 +31,8 @@#define SMP_TIMEOUT msecs_to_jiffies(30000) +#define AUTH_REQ_MASK 0x07 +static inline void swap128 (u8 src[16 ],u8 dst[16 ]) {int i;
@@ -229,7 +231,7 @@ static void build_pairing_cmd(struct l2cap_conn *conn, req->max_key_size =SMP_MAX_ENC_KEY_SIZE ; req->init_key_dist =0 ; req->resp_key_dist = dist_keys; - req->auth_req = authreq; + req->auth_req = (authreq &AUTH_REQ_MASK );return ; }
@@ -238,7 +240,7 @@ static void build_pairing_cmd(struct l2cap_conn *conn, rsp->max_key_size =SMP_MAX_ENC_KEY_SIZE ; rsp->init_key_dist =0 ; rsp->resp_key_dist = req->resp_key_dist & dist_keys; - rsp->auth_req = authreq; + rsp->auth_req = (authreq &AUTH_REQ_MASK ); }static u8 check_enc_key_size (struct l2cap_conn *conn,__u8 max_key_size)
net/mac80211/wpa.c +2 -1
@@ -106,7 +106,8 @@ ieee80211_rx_h_michael_mic_verify(struct ieee80211_rx_data *rx)if (status->flag &RX_FLAG_MMIC_ERROR ) goto mic_fail; -if (!(status->flag &RX_FLAG_IV_STRIPPED ) && rx->key) +if (!(status->flag &RX_FLAG_IV_STRIPPED ) && rx->key && + rx->key->conf.cipher ==WLAN_CIPHER_SUITE_TKIP ) goto update_iv;return RX_CONTINUE ;
net/sunrpc/xprtsock.c +10 -31
116 lines not on this page · raw message
sound/pci/hda/patch_realtek.c +1 -0
@@ -6184,6 +6184,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {SND_PCI_QUIRK (0x17aa ,0x21e9 ,"Thinkpad Edge 15" ,ALC269_FIXUP_SKU_IGNORE ),SND_PCI_QUIRK (0x17aa ,0x21f6 ,"Thinkpad T530" ,ALC269_FIXUP_LENOVO_DOCK ),SND_PCI_QUIRK (0x17aa ,0x21fa ,"Thinkpad X230" ,ALC269_FIXUP_LENOVO_DOCK ), +SND_PCI_QUIRK (0x17aa ,0x21f3 ,"Thinkpad T430" ,ALC269_FIXUP_LENOVO_DOCK ),SND_PCI_QUIRK (0x17aa ,0x21fb ,"Thinkpad T430s" ,ALC269_FIXUP_LENOVO_DOCK ),SND_PCI_QUIRK (0x17aa ,0x2203 ,"Thinkpad X230 Tablet" ,ALC269_FIXUP_LENOVO_DOCK ), SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K),
usr/gen_init_cpio.c +23 -20
55 lines not on this page · raw message