Linux 2.6.32.13
Subsystems (61)
I'm announcing the release of the 2.6.32.13 kernel.
All users of the 2.6.32 kernel series should upgrade.
The updated 2.6.32.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.32.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.32.y.git;a=summarythanks,
greg k-h
------------
Documentation/kernel-parameters.txt | 5 Makefile | 2 arch/arm/mach-pxa/include/mach/colibri.h | 1 arch/mips/include/asm/mach-sibyte/war.h | 6 - arch/mips/sibyte/sb1250/setup.c | 15 ++ arch/parisc/kernel/pci.c | 7 - arch/powerpc/mm/fsl_booke_mmu.c | 5 arch/x86/Kconfig | 9 + arch/x86/kernel/acpi/sleep.c | 2 arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 3 arch/x86/kernel/cpu/intel.c | 21 +++ arch/x86/kernel/cpu/intel_cacheinfo.c | 13 +- arch/x86/kernel/k8.c | 14 ++ arch/x86/kernel/pci-gart_64.c | 2 arch/x86/kernel/process_64.c | 5 arch/x86/kvm/x86.c | 12 -- block/blk-timeout.c | 12 -- crypto/async_tx/async_raid6_recov.c | 21 ++- drivers/Makefile | 2 drivers/acpi/power_meter.c | 2 drivers/acpi/sleep.c | 173 +++++++++++++++++++++++++++--- drivers/ata/libata-eh.c | 5 drivers/char/agp/Kconfig | 2 drivers/cpuidle/governors/menu.c | 9 - drivers/edac/edac_mce_amd.c | 5 drivers/gpu/drm/i915/i915_gem.c | 6 + drivers/gpu/drm/i915/i915_gem_tiling.c | 22 +-- drivers/gpu/drm/i915/i915_reg.h | 2 drivers/i2c/i2c-core.c | 26 +++- drivers/md/md.c | 10 + drivers/md/raid5.c | 54 ++++----- drivers/media/dvb/ttpci/budget.c | 3 drivers/net/bnx2.c | 6 - drivers/net/r8169.c | 13 +- drivers/net/tg3.c | 1 drivers/net/usb/dm9601.c | 2 drivers/net/wireless/p54/p54pci.c | 10 + drivers/net/wireless/p54/p54usb.c | 1 drivers/net/wireless/p54/txrx.c | 2 drivers/pci/pci.c | 6 - drivers/scsi/libiscsi.c | 2 drivers/scsi/libsas/sas_ata.c | 4 drivers/scsi/libsas/sas_scsi_host.c | 4 drivers/scsi/qla2xxx/qla_isr.c | 120 +++++++++----------- drivers/scsi/scsi_debug.c | 3 drivers/scsi/scsi_error.c | 15 ++ drivers/scsi/scsi_lib.c | 10 + drivers/scsi/sd.c | 1 drivers/serial/8250_pnp.c | 2 drivers/staging/hv/Hv.c | 2 drivers/staging/hv/RndisFilter.c | 1 drivers/staging/hv/netvsc_drv.c | 3 drivers/staging/usbip/usbip_event.c | 3 drivers/usb/core/driver.c | 32 +++++ drivers/usb/core/generic.c | 2 drivers/usb/core/inode.c | 4 drivers/usb/host/ehci-hcd.c | 1 drivers/usb/host/ehci-mem.c | 2 drivers/usb/host/ehci-sched.c | 38 +++++- drivers/usb/host/ehci.h | 5 drivers/usb/host/ohci-hub.c | 2 drivers/usb/host/xhci-mem.c | 65 +++++++++++ drivers/usb/host/xhci.h | 4 drivers/usb/serial/sierra.c | 1 drivers/w1/slaves/w1_therm.c | 5 fs/ext4/extents.c | 9 + fs/jfs/resize.c | 6 - fs/nfs/client.c | 2 fs/nfs/dir.c | 2 fs/nfsd/nfs4xdr.c | 8 - fs/ocfs2/buffer_head_io.c | 2 fs/ocfs2/dlm/dlmfs.c | 2 fs/ocfs2/inode.c | 1 fs/ocfs2/refcounttree.c | 3 fs/proc/base.c | 2 fs/reiserfs/dir.c | 2 fs/reiserfs/xattr.c | 19 --- fs/xfs/linux-2.6/xfs_super.c | 5 fs/xfs/linux-2.6/xfs_sync.c | 107 +++++++++++++++++- fs/xfs/linux-2.6/xfs_sync.h | 7 + fs/xfs/quota/xfs_qm_syscalls.c | 3 fs/xfs/xfs_ag.h | 1 fs/xfs/xfs_mount.h | 1 include/linux/acpi.h | 1 include/linux/ata.h | 4 include/linux/poison.h | 25 +++- include/linux/syscalls.h | 6 - include/trace/ftrace.h | 3 init/initramfs.c | 3 kernel/cred.c | 2 kernel/perf_event.c | 2 kernel/trace/trace.h | 3 lib/flex_array.c | 2 mm/hugetlb.c | 5 mm/memcontrol.c | 4 net/dccp/probe.c | 3 net/mac80211/agg-tx.c | 1 security/inode.c | 4 security/keys/request_key.c | 9 + sound/pci/hda/hda_intel.c | 1 sound/pci/hda/patch_conexant.c | 10 + sound/pci/hda/patch_realtek.c | 2 sound/pci/hda/patch_sigmatel.c | 6 + sound/pci/maestro3.c | 9 + 104 files changed, 843 insertions(+), 292 deletions(-)
Al Viro (1):
nfs d_revalidate() is too trigger-happy with d_drop()
Alan Stern (4):
USB: EHCI: defer reclamation of siTDs
USB: fix remote wakeup settings during system sleep
USB: don't choose configs with no interfaces
USB: OHCI: don't look at the root hub to get the number of ports
Alex Chiang (1):
ACPI: DMI init_set_sci_en_on_resume for multiple Lenovo ThinkPads
Andre Detsch (1):
tg3: Fix INTx fallback when MSI fails
Andrea Arcangeli (1):
memcg: fix prepare migration
Arjan van de Ven (1):
cpuidle: Fix incorrect optimization
Avi Kivity (1):
core, x86: make LIST_POISON less deadly
Bill Pemberton (1):
jfs: fix diAllocExt error in resizing filesystem
Bjørn Mork (1):
V4L/DVB: budget: Oops: "BUG: unable to handle kernel NULL pointer dereference"
Borislav Petkov (2):
edac, mce: Fix wrong mask and macro usage
x86, k8 nb: Fix boot crash: enable k8_northbridges unconditionally on AMD systems
Carlos O'Donell (1):
parisc: Set PCI CLS early in boot.
Changli Gao (1):
flex_array: fix the panic when calling flex_array_alloc() without __GFP_ZERO
Christian Lamparter (1):
p54pci: rx frame length check
Chuck Lever (1):
NFS: rsize and wsize settings ignored on v4 mounts
Cyrill Gorcunov (1):
Staging: hv: Fix up memory leak on HvCleanup
Dan Carpenter (4):
USB: fix testing the wrong variable in fs_create_by_name()
ocfs2: potential ERR_PTR dereference on error paths
security: testing the wrong variable in create_by_name()
power_meter: acpi_device_class "power_meter_resource" too long
Dan Williams (1):
raid6: fix recovery performance regression
Daniel T Chen (8):
ALSA: hda: Use LPIB quirk for DG965OT board version AAD63733-203
ALSA: hda: Use STAC_DELL_M6_BOTH quirk for Dell Studio XPS 1645
ALSA: hda: Use STAC_DELL_M6_BOTH quirk for Dell Studio 1558
ALSA: hda: Use ALC880_F1734 quirk for Fujitsu Siemens AMILO Xi 1526
ALSA: hda: Fix max PCM level to 0 dB for Fujitsu-Siemens laptops using CX20549 (Venice)
ALSA: hda: Fix 0 dB for Packard Bell models using Conexant CX20549 (Venice)
ALSA: hda: Use olpc-xo-1_5 quirk for Toshiba Satellite Pro T130-15F
ALSA: hda: Use olpc-xo-1_5 quirk for Toshiba Satellite P500-PSPGSC-01800T
Daniel Vetter (1):
drm/i915: fix tiling limits for i915 class hw v2
Darren Jenkins (1):
drivers/net/wireless/p54/txrx.c Fix off by one error
Dave Chinner (1):
xfs: add a shrinker to background inode reclaim
David Dillow (1):
r8169: use correct barrier between cacheable and non-cacheable memory
David Howells (2):
keys: the request_key() syscall should link an existing key to the dest keyring
CRED: Fix a race in creds_are_invalid() in credentials debugging
Douglas Gilbert (2):
skip sense logging for some ATA PASS-THROUGH cdbs
scsi_debug: virtual_gb ignores sector_size
Eric Lescouet (1):
staging: usbip: Fix deadlock
Francois Romieu (1):
r8169: fix broken register writes
Gabriele A. Trombetti (1):
md/raid6: Fix raid-6 read-error correction in degraded state
Greg Kroah-Hartman (1):
Linux 2.6.32.13
H. Peter Anvin (2):
x86-64: Clear a 64-bit FS/GS base on fork if selector is nonzero
x86: Disable large pages on CPUs with Atom erratum AAE44
Haiyang Zhang (1):
Staging: hv: Fix a bug affecting IPv6
Hannes Reinecke (1):
Enable retries for SYNCRONIZE_CACHE commands to fix I/O error
Hans de Goede (3):
p54pci: fix bugs in p54p_check_tx_ring
ALSA: snd-meastro3: Add amp_gpio quirk for Compaq EVO N600C
ALSA: snd-meastro3: Ignore spurious HV interrupts during suspend / resume
Ian Dall (1):
w1: w1 temp: fix negative termperature calculation
Jakob Viketoft (1):
pxa/colibri: fix missing #include <mach/mfp.h> in colibri.h
James Bottomley (1):
SCSI: Retry commands with UNIT_ATTENTION sense codes to fix ext3/ext4 I/O error
Jean Delvare (1):
i2c: Fix probing of FSC hardware monitoring chips
Jeff Garzik (1):
libata: ensure NCQ error result taskfile is fully initialized before returning it via qc->result_tf.
Jeff Mahoney (3):
reiserfs: fix permissions on .reiserfs_priv
reiserfs: fix corruption during shrinking of xattrs
tracing: Fix ftrace_event_call alignment for use with gcc 4.5
Jerome Marchand (1):
procfs: fix tid fdinfo
Joel Becker (2):
ocfs2: Compute metaecc for superblocks during online resize.
ocfs2_dlmfs: Fix math error when reading LVB.
Johannes Berg (1):
mac80211: remove bogus TX agg state assignment
Kamal Mostafa (1):
ACPI: sleep: init_set_sci_en_on_resume for Dell Studio 155x
Kunal Gangakhedkar (1):
ALSA: hda - Add PCI quirk for HP dv6-1110ax.
Lalit Chandivade (1):
qla2xxx: Properly handle UNDERRUN completion statuses.
Leonard Michlmayr (1):
ext4: correctly calculate number of blocks for fiemap
Marcelo Tosatti (1):
KVM: remove unused load_segment_descriptor_to_kvm_desct
Mark Langsdorf (1):
powernow-k8: Fix frequency reporting
Mark Lord (1):
libata: Fix accesses at LBA28 boundary (old bug, but nasty) (v2)
Matthew Garrett (1):
PCI: Ensure we re-enable devices on resume
Mel Gorman (1):
hugetlb: fix infinite loop in get_futex_key() when backed by huge pages
Michael Chan (1):
bnx2: Fix lost MSI-X problem on 5709 NICs.
Mike Christie (1):
SCSI: libiscsi: regression: fix header digest errors
Neil Brown (1):
nfsd4: bug in read_buf
Neil Horman (1):
dccp_probe: Fix module load dependencies between dccp and dccp_probe
NeilBrown (3):
md/raid5: allow for more than 2^31 chunks. md/raid5: fix previous patch.
md: restore ability of spare drives to spin down.
Peter Korsgaard (1):
dm9601: fix phy/eeprom write routine
Phillip Lougher (1):
initramfs: handle unrecognised decompressor when unpacking
Ping Cheng (1):
serial: 8250_pnp - add Fujitsu Wacom device
Prarit Bhargava (1):
x86, AMD: Fix stale cpuid4_info shared_map data in shared_cpu_map cpumasks
Ralf Baechle (1):
MIPS: Sibyte: Apply M3 workaround only on affected chip types and versions.
Richard Kennedy (1):
block: ensure jiffies wrap is handled correctly in blk_rq_timed_out_timer
Sarah Sharp (2):
USB: xhci: properly set the "Mult" field of the endpoint context.
USB: xhci: properly set endpoint context fields for periodic eps.
Shimada Hirofumi (1):
p54usb: Add usbid for Corega CG-WLUSB2GT.
Stephen Hemminger (1):
Staging: hv: name network device ethX rather than sethX
Stijn Tintel (1):
virtio: initialize earlier
Tao Ma (1):
ocfs2: Update VFS inode's id info after reflink.
Tejun Heo (3):
libata: fix locking around blk_abort_request()
perf: Fix resource leak in failure path of perf_event_open()
SCSI: fix locking around blk_abort_request()
William Lightning (1):
USB: Add id for HP ev2210 a.k.a Sierra MC5725 miniPCI-e Cell Modem.
Wufei (1):
kgdb: don't needlessly skip PAGE_USER test for Fsl booke
Zhang Rui (1):
ACPI: introduce kernel parameter acpi_sleep=sci_force_enable
françois romieu (1):
r8169: more broken register writes workaround
Documentation/kernel-parameters.txt +4 -1
@@ -241,7 +241,7 @@ and is between 256 and 4096 characters. It is defined in the file acpi_sleep= [HW,ACPI] Sleep options Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig, - old_ordering, s4_nonvs } + old_ordering, s4_nonvs, sci_force_enable } See Documentation/power/video.txt for information on s3_bios and s3_mode. s3_beep is for debugging; it makes the PC's speaker beep
@@ -254,6 +254,9 @@ and is between 256 and 4096 characters. It is defined in the file of _PTS is used by default). s4_nonvs prevents the kernel from saving/restoring the ACPI NVS memory during hibernation. + sci_force_enable causes the kernel to set SCI_EN directly + on resume from S1/S3 (which is against the ACPI spec, + but some broken systems don't work without it). acpi_use_timer_override [HW,ACPI] Use timer override. For some broken Nvidia NF5 boards
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 32 -EXTRAVERSION = .12 +EXTRAVERSION = .13 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION*
arch/arm/mach-pxa/include/mach/colibri.h +1 -0
@@ -2,6 +2,7 @@#define _COLIBRI_H_#include <net/ax88796.h> +#include <mach/mfp.h> /* * common settings for all modules
arch/mips/include/asm/mach-sibyte/war.h +5 -1
@@ -16,7 +16,11 @@#if defined(CONFIG_SB1_PASS_1_WORKAROUNDS ) || \ defined(CONFIG_SB1_PASS_2_WORKAROUNDS ) -#define BCM1250_M3_WAR 1 +#ifndef __ASSEMBLY__ +extern int sb1250_m3_workaround_needed (void ); +#endif + +#define BCM1250_M3_WAR sb1250_m3_workaround_needed()#define SIBYTE_1956_WAR 1#else
arch/mips/sibyte/sb1250/setup.c +15 -0
@@ -87,6 +87,21 @@ static int __init setup_bcm1250(void)return ret; } +int sb1250_m3_workaround_needed (void ) +{ +switch (soc_type) { +case K_SYS_SOC_TYPE_BCM1250 : +case K_SYS_SOC_TYPE_BCM1250_ALT : +case K_SYS_SOC_TYPE_BCM1250_ALT2 : +case K_SYS_SOC_TYPE_BCM1125 : +case K_SYS_SOC_TYPE_BCM1125H : +return soc_pass <K_SYS_REVISION_BCM1250_C0 ; + +default : +return 0 ; + } +} +static int __init setup_bcm112x (void ) {int ret =0 ;
arch/parisc/kernel/pci.c +5 -2
@@ -18,7 +18,6 @@#include <asm/io.h> #include <asm/system.h> -#include <asm/cache.h> /* for L1_CACHE_BYTES */ #include <asm/superio.h> #define DEBUG_RESOURCES 0
@@ -123,6 +122,10 @@ static int __init pcibios_init(void) }else {printk (KERN_WARNING "pci_bios != NULL but init() is!\n" ); } + +/* Set the CLS for PCI as early as possible. */ + pci_cache_line_size = pci_dfl_cache_line_size; +return 0 ; }
@@ -171,7 +174,7 @@ void pcibios_set_master(struct pci_dev *dev)** upper byte is PCI_LATENCY_TIMER. */ pci_write_config_word (dev,PCI_CACHE_LINE_SIZE , - (0x80 <<8 ) | (L1_CACHE_BYTES /sizeof (u32))); + (0x80 <<8 ) | pci_cache_line_size); }
arch/powerpc/mm/fsl_booke_mmu.c +0 -5
@@ -131,15 +131,10 @@ void settlbcam(int index, unsigned long virt, phys_addr_t phys,TLBCAM [index].MAS3 = (phys &PAGE_MASK ) |MAS3_SX |MAS3_SR ;TLBCAM [index].MAS3 |= ((flags & _PAGE_RW) ?MAS3_SW :0 ); -#ifndef CONFIG_KGDB /* want user access for breakpoints */ if (flags & _PAGE_USER) {TLBCAM [index].MAS3 |=MAS3_UX |MAS3_UR ;TLBCAM [index].MAS3 |= ((flags & _PAGE_RW) ?MAS3_UW :0 ); } -#else -TLBCAM [index].MAS3 |=MAS3_UX |MAS3_UR ; -TLBCAM [index].MAS3 |= ((flags & _PAGE_RW) ?MAS3_UW :0 ); -#endif tlbcam_addrs[index].start = virt; tlbcam_addrs[index].limit = virt + size -1 ;
arch/x86/Kconfig +7 -2
@@ -622,7 +622,7 @@ config GART_IOMMU bool "GART IOMMU support" if EMBEDDED default y select SWIOTLB - depends on X86_64 && PCI + depends on X86_64 && PCI && K8_NB ---help--- Support for full DMA access of devices with 32bit memory access only on systems with more than 3GB. This is usually needed for USB,
@@ -1236,6 +1236,11 @@ config ARCH_MEMORY_PROBE def_bool X86_64 depends on MEMORY_HOTPLUG +config ILLEGAL_POINTER_VALUE + hex + default 0 if X86_32 + default 0xdead000000000000 if X86_64 + source "mm/Kconfig" config HIGHPTE
@@ -2022,7 +2027,7 @@ endif # X86_32 config K8_NB def_bool y - depends on AGP_AMD64 || (X86_64 && (GART_IOMMU || (PCI && NUMA))) + depends on CPU_SUP_AMD && PCI source "drivers/pcmcia/Kconfig"
arch/x86/kernel/acpi/sleep.c +2 -0
@@ -162,6 +162,8 @@ static int __init acpi_sleep_setup(char *str)#endif if (strncmp (str,"old_ordering" ,12 ) ==0 )acpi_old_suspend_ordering (); +if (strncmp (str,"sci_force_enable" ,16 ) ==0 ) +acpi_set_sci_en_on_resume (); str =strchr (str,',' );if (str !=NULL ) str +=strspn (str,", \t" );
arch/x86/kernel/cpu/cpufreq/powernow-k8.c +2 -1
@@ -929,7 +929,8 @@ static int fill_powernow_table_pstate(struct powernow_k8_data *data, powernow_table[i].index = index;/* Frequency may be rounded for these */ -if (boot_cpu_data.x86 ==0x10 || boot_cpu_data.x86 ==0x11 ) { +if ((boot_cpu_data.x86 ==0x10 && boot_cpu_data.x86_model <10 ) + || boot_cpu_data.x86 ==0x11 ) { powernow_table[i].frequency =freq_from_fid_did (lo &0x3f , (lo >>6 ) &7 ); }else
arch/x86/kernel/cpu/intel.c +21 -0
@@ -47,6 +47,27 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) (c->x86 == 0x6 && c->x86_model >= 0x0e))set_cpu_cap (c,X86_FEATURE_CONSTANT_TSC ); +/* +* Atom erratum AAE44/AAF40/AAG38/AAH41: +* +* A race condition between speculative fetches and invalidating +* a large page. This is worked around in microcode, but we +* need the microcode to have already been loaded... so if it is +* not, recommend a BIOS update and disable large pages. +*/ +if (c->x86 ==6 && c->x86_model ==0x1c && c->x86_mask <=2 ) { +u32 ucode, junk; + +wrmsr (MSR_IA32_UCODE_REV ,0 ,0 ); +sync_core (); +rdmsr (MSR_IA32_UCODE_REV , junk, ucode); + +if (ucode <0x20e ) { +printk (KERN_WARNING "Atom PSE erratum detected, BIOS microcode update recommended\n" ); +clear_cpu_cap (c,X86_FEATURE_PSE ); + } + } +#ifdef CONFIG_X86_64 set_cpu_cap (c,X86_FEATURE_SYSENTER32 );#else
arch/x86/kernel/cpu/intel_cacheinfo.c +7 -6
@@ -647,18 +647,19 @@ static void __cpuinit cache_shared_cpu_map_setup(unsigned int cpu, int index) {struct _cpuid4_info *this_leaf, *sibling_leaf;unsigned long num_threads_sharing; -int index_msb, i; +int index_msb, i, sibling;struct cpuinfo_x86 *c = &cpu_data (cpu);if ((index ==3 ) && (c->x86_vendor ==X86_VENDOR_AMD )) { -struct cpuinfo_x86 *d; -for_each_online_cpu (i) { +for_each_cpu (i, c->llc_shared_map) {if (!per_cpu (cpuid4_info, i))continue ; - d = &cpu_data (i); this_leaf =CPUID4_INFO_IDX (i, index); -cpumask_copy (to_cpumask (this_leaf->shared_cpu_map), - d->llc_shared_map); +for_each_cpu (sibling, c->llc_shared_map) { +if (!cpu_online (sibling)) +continue ; +set_bit (sibling, this_leaf->shared_cpu_map); + } }return ; }
arch/x86/kernel/k8.c +14 -0
@@ -121,3 +121,17 @@ void k8_flush_garts(void) }EXPORT_SYMBOL_GPL (k8_flush_garts); +static __init int init_k8_nbs (void ) +{ +int err =0 ; + + err =cache_k8_northbridges (); + +if (err <0 ) +printk (KERN_NOTICE "K8 NB: Cannot enumerate AMD northbridges.\n" ); + +return err; +} + +/* This has to go after the PCI subsystem */ +fs_initcall (init_k8_nbs);
arch/x86/kernel/pci-gart_64.c +1 -1
@@ -720,7 +720,7 @@ void __init gart_iommu_init(void)unsigned long scratch;long i; -if (cache_k8_northbridges () <0 || num_k8_northbridges ==0 ) +if (num_k8_northbridges ==0 )return ;#ifndef CONFIG_AGP_AMD64
arch/x86/kernel/process_64.c +2 -3
@@ -295,11 +295,10 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,set_tsk_thread_flag (p,TIF_FORK ); - p->thread.fs = me->thread.fs; - p->thread.gs = me->thread.gs; -savesegment (gs, p->thread.gsindex); + p->thread.gs = p->thread.gsindex ?0 : me->thread.gs;savesegment (fs, p->thread.fsindex); + p->thread.fs = p->thread.fsindex ?0 : me->thread.fs;savesegment (es, p->thread.es);savesegment (ds, p->thread.ds);
arch/x86/kvm/x86.c +0 -12
@@ -4155,18 +4155,6 @@ static u16 get_segment_selector(struct kvm_vcpu *vcpu, int seg)return kvm_seg.selector; } -static int load_segment_descriptor_to_kvm_desct (struct kvm_vcpu *vcpu, -u16 selector, -struct kvm_segment *kvm_seg) -{ -struct desc_struct seg_desc; - -if (load_guest_segment_descriptor (vcpu, selector, &seg_desc)) -return 1 ; -seg_desct_to_kvm_desct (&seg_desc, selector, kvm_seg); -return 0 ; -} -static int kvm_load_realmode_segment (struct kvm_vcpu *vcpu,u16 selector,int seg) {struct kvm_segment segvar = {
block/blk-timeout.c +5 -7
@@ -109,6 +109,7 @@ void blk_rq_timed_out_timer(unsigned long data)struct request_queue *q = (struct request_queue *) data;unsigned long flags, next =0 ;struct request *rq, *tmp; +int next_set =0 ;spin_lock_irqsave (q->queue_lock, flags);
@@ -122,16 +123,13 @@ void blk_rq_timed_out_timer(unsigned long data)if (blk_mark_rq_complete (rq))continue ;blk_rq_timed_out (rq); - }else if (!next ||time_after (next, rq->deadline)) + }else if (!next_set ||time_after (next, rq->deadline)) { next = rq->deadline; + next_set =1 ; + } } -/* -* next can never be 0 here with the list non-empty, since we always -* bump ->deadline to 1 so we can detect if the timer was ever added -* or not. See comment in blk_add_timer() -*/ -if (next) +if (next_set)mod_timer (&q->timeout,round_jiffies_up (next));spin_unlock_irqrestore (q->queue_lock, flags);
crypto/async_tx/async_raid6_recov.c +13 -8
@@ -324,6 +324,7 @@ struct dma_async_tx_descriptor * async_raid6_2data_recov(int disks, size_t bytes, int faila, int failb, struct page **blocks, struct async_submit_ctl *submit) { + void *scribble = submit->scribble;int non_zero_srcs, i;BUG_ON (faila == failb);
@@ -332,11 +333,13 @@ async_raid6_2data_recov(int disks, size_t bytes, int faila, int failb,pr_debug ("%s: disks: %d len: %zu\n" , __func__, disks, bytes); -/* we need to preserve the contents of 'blocks' for the async -* case, so punt to synchronous if a scribble buffer is not available +/* if a dma resource is not available or a scribble buffer is not +* available punt to the synchronous path. In the 'dma not +* available' case be sure to use the scribble buffer to +* preserve the content of 'blocks' as the caller intended. */ -if (!submit->scribble) { -void **ptrs = (void **) blocks; +if (!async_dma_find_channel (DMA_PQ ) || !scribble) { +void **ptrs = scribble ? scribble : (void **) blocks;async_tx_quiesce (&submit->depend_tx);for (i =0 ; i < disks; i++)
@@ -406,11 +409,13 @@ async_raid6_datap_recov(int disks, size_t bytes, int faila,pr_debug ("%s: disks: %d len: %zu\n" , __func__, disks, bytes); -/* we need to preserve the contents of 'blocks' for the async -* case, so punt to synchronous if a scribble buffer is not available +/* if a dma resource is not available or a scribble buffer is not +* available punt to the synchronous path. In the 'dma not +* available' case be sure to use the scribble buffer to +* preserve the content of 'blocks' as the caller intended. */ -if (!scribble) { -void **ptrs = (void **) blocks; +if (!async_dma_find_channel (DMA_PQ ) || !scribble) { +void **ptrs = scribble ? scribble : (void **) blocks;async_tx_quiesce (&submit->depend_tx);for (i =0 ; i < disks; i++)
drivers/Makefile +1 -1
@@ -17,6 +17,7 @@ obj-$(CONFIG_SFI) += sfi/ obj-$(CONFIG_PNP) += pnp/ obj-$(CONFIG_ARM_AMBA) += amba/ +obj-$(CONFIG_VIRTIO) += virtio/ obj-$(CONFIG_XEN) += xen/ # regulators early, since some subsystems rely on them to initialize
@@ -106,7 +107,6 @@ obj-$(CONFIG_HID) += hid/ obj-$(CONFIG_PPC_PS3) += ps3/ obj-$(CONFIG_OF) += of/ obj-$(CONFIG_SSB) += ssb/ -obj-$(CONFIG_VIRTIO) += virtio/ obj-$(CONFIG_VLYNQ) += vlynq/ obj-$(CONFIG_STAGING) += staging/ obj-y += platform/
drivers/acpi/power_meter.c +1 -1
@@ -34,7 +34,7 @@#define ACPI_POWER_METER_NAME "power_meter"ACPI_MODULE_NAME (ACPI_POWER_METER_NAME );#define ACPI_POWER_METER_DEVICE_NAME "Power Meter" -#define ACPI_POWER_METER_CLASS "power_meter_resource" +#define ACPI_POWER_METER_CLASS "pwr_meter_resource"#define NUM_SENSORS 17
drivers/acpi/sleep.c +161 -12
197 lines not on this page · raw message
drivers/ata/libata-eh.c +5 -0
@@ -870,6 +870,8 @@ static void ata_eh_set_pending(struct ata_port *ap, int fastdrain)void ata_qc_schedule_eh (struct ata_queued_cmd *qc) {struct ata_port *ap = qc->ap; +struct request_queue *q = qc->scsicmd->device->request_queue; +unsigned long flags;WARN_ON (!ap->ops->error_handler);
@@ -881,7 +883,9 @@ void ata_qc_schedule_eh(struct ata_queued_cmd *qc)* Note that ATA_QCFLAG_FAILED is unconditionally set after * this function completes. */ +spin_lock_irqsave (q->queue_lock, flags);blk_abort_request (qc->scsicmd->request); +spin_unlock_irqrestore (q->queue_lock, flags); }/**
@@ -1615,6 +1619,7 @@ void ata_eh_analyze_ncq_error(struct ata_link *link) }/* okay, this error is ours */ +memset (&tf,0 ,sizeof (tf)); rc =ata_eh_read_log_10h (dev, &tag, &tf);if (rc) { ata_link_printk(link, KERN_ERR, "failed to read log page 10h "
drivers/char/agp/Kconfig +1 -1
@@ -57,7 +57,7 @@ config AGP_AMD config AGP_AMD64 tristate "AMD Opteron/Athlon64 on-CPU GART support" if !GART_IOMMU - depends on AGP && X86 + depends on AGP && X86 && K8_NB default y if GART_IOMMU help This option gives you AGP support for the GLX component of
drivers/cpuidle/governors/menu.c +4 -5
@@ -101,7 +101,6 @@ struct menu_device {unsigned int expected_us;u64 predicted_us; -unsigned int measured_us;unsigned int exit_us;unsigned int bucket;u64 correction_factor[BUCKETS ];
@@ -187,14 +186,14 @@ static int menu_select(struct cpuidle_device *dev)int i;int multiplier; - data->last_state_idx =0 ; - data->exit_us =0 ; -if (data->needs_update) {menu_update (dev); data->needs_update =0 ; } + data->last_state_idx =0 ; + data->exit_us =0 ; +/* Special case when user has set very strict latency requirement */ if (unlikely (latency_req ==0 ))return 0 ;
@@ -294,7 +293,7 @@ static void menu_update(struct cpuidle_device *dev) new_factor = data->correction_factor[data->bucket] * (DECAY -1 ) /DECAY ; -if (data->expected_us >0 && data->measured_us <MAX_INTERESTING ) +if (data->expected_us >0 && measured_us <MAX_INTERESTING ) new_factor +=RESOLUTION * measured_us / data->expected_us;else /*
drivers/edac/edac_mce_amd.c +2 -3
@@ -295,7 +295,6 @@ wrong_ls_mce:void amd_decode_nb_mce (int node_id,struct err_regs *regs,int handle_errors) {u32 ec =ERROR_CODE (regs->nbsl); -u32 xec =EXT_ERROR_CODE (regs->nbsl);if (!handle_errors)return ;
@@ -319,7 +318,7 @@ void amd_decode_nb_mce(int node_id, struct err_regs *regs, int handle_errors)pr_cont ("\n" ); } -pr_emerg ("%s.\n" ,EXT_ERR_MSG (xec)); +pr_emerg ("%s.\n" ,EXT_ERR_MSG (regs->nbsl));if (BUS_ERROR (ec) && nb_bus_decoder)nb_bus_decoder (node_id, regs);
@@ -382,7 +381,7 @@ static void amd_decode_mce(struct mce *m) ((m->status & MCI_STATUS_PCC) ? "yes" : "no"));/* do the two bits[14:13] together */ - ecc = m->status & (3ULL <<45 ); + ecc = (m->status >>45 ) &0x3 ;if (ecc)pr_cont (", %sECC Error" , ((ecc ==2 ) ?"C" :"U" ));
drivers/gpu/drm/i915/i915_gem.c +6 -0
@@ -2334,6 +2334,12 @@ static void i915_write_fence_reg(struct drm_i915_fence_reg *reg) pitch_val = obj_priv->stride / tile_width; pitch_val =ffs (pitch_val) -1 ; +if (obj_priv->tiling_mode ==I915_TILING_Y && +HAS_128_BYTE_Y_TILING (dev)) +WARN_ON (pitch_val >I830_FENCE_MAX_PITCH_VAL ); +else +WARN_ON (pitch_val >I915_FENCE_MAX_PITCH_VAL ); + val = obj_priv->gtt_offset;if (obj_priv->tiling_mode ==I915_TILING_Y ) val |=1 <<I830_FENCE_TILING_Y_SHIFT ;
drivers/gpu/drm/i915/i915_gem_tiling.c +9 -13
@@ -353,21 +353,17 @@ i915_tiling_ok(struct drm_device *dev, int stride, int size, int tiling_mode)* reg, so dont bother to check the size */ if (stride /128 >I965_FENCE_MAX_PITCH_VAL )return false; - }else if (IS_I9XX (dev)) { -uint32_t pitch_val =ffs (stride / tile_width) -1 ; - -/* XXX: For Y tiling, FENCE_MAX_PITCH_VAL is actually 6 (8KB) -* instead of 4 (2KB) on 945s. -*/ -if (pitch_val >I915_FENCE_MAX_PITCH_VAL || - size > (I830_FENCE_MAX_SIZE_VAL <<20 )) + }else if (IS_I9XX (dev) ||IS_I8XX (dev)) { +if (stride >8192 )return false; - }else { -uint32_t pitch_val =ffs (stride / tile_width) -1 ; -if (pitch_val >I830_FENCE_MAX_PITCH_VAL || - size > (I830_FENCE_MAX_SIZE_VAL <<19 )) -return false; +if (IS_I9XX (dev)) { +if (size >I830_FENCE_MAX_SIZE_VAL <<20 ) +return false; + }else { +if (size >I830_FENCE_MAX_SIZE_VAL <<19 ) +return false; + } }/* 965+ just needs multiples of tile width */
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -214,7 +214,7 @@#define I830_FENCE_SIZE_BITS (size) ((ffs((size) >> 19) - 1) << 8)#define I830_FENCE_PITCH_SHIFT 4#define I830_FENCE_REG_VALID (1<<0) -#define I915_FENCE_MAX_PITCH_VAL 0x10 +#define I915_FENCE_MAX_PITCH_VAL 4#define I830_FENCE_MAX_PITCH_VAL 6#define I830_FENCE_MAX_SIZE_VAL (1<<8)
drivers/i2c/i2c-core.c +18 -8
@@ -1202,14 +1202,24 @@ static int i2c_detect_address(struct i2c_client *temp_client, int kind,/* Make sure there is something at this address, unless forced */ if (kind <0 ) { -if (i2c_smbus_xfer (adapter, addr,0 ,0 ,0 , -I2C_SMBUS_QUICK ,NULL ) <0 ) -return 0 ; - -/* prevent 24RF08 corruption */ -if ((addr & ~0x0f ) ==0x50 ) -i2c_smbus_xfer (adapter, addr,0 ,0 ,0 , -I2C_SMBUS_QUICK ,NULL ); +if (addr ==0x73 && (adapter->class &I2C_CLASS_HWMON )) { +/* Special probe for FSC hwmon chips */ +union i2c_smbus_data dummy; + +if (i2c_smbus_xfer (adapter, addr,0 ,I2C_SMBUS_READ ,0 , +I2C_SMBUS_BYTE_DATA , &dummy) <0 ) +return 0 ; + }else { +if (i2c_smbus_xfer (adapter, addr,0 ,I2C_SMBUS_WRITE ,0 , +I2C_SMBUS_QUICK ,NULL ) <0 ) +return 0 ; + +/* Prevent 24RF08 corruption */ +if ((addr & ~0x0f ) ==0x50 ) +i2c_smbus_xfer (adapter, addr,0 , +I2C_SMBUS_WRITE ,0 , +I2C_SMBUS_QUICK ,NULL ); + } }/* Finally call the custom detection function */
drivers/md/md.c +8 -2
@@ -2011,12 +2011,18 @@ repeat:if (!mddev->in_sync || mddev->recovery_cp != MaxSector) {/* not clean */ /* .. if the array isn't clean, an 'even' event must also go * to spares. */ -if ((mddev->events&1 )==0 ) +if ((mddev->events&1 )==0 ) { nospares =0 ; + sync_req =2 ;/* force a second update to get the +* even/odd in sync */ + } }else {/* otherwise an 'odd' event must go to spares */ -if ((mddev->events&1 )) +if ((mddev->events&1 )) { nospares =0 ; + sync_req =2 ;/* force a second update to get the +* even/odd in sync */ + } } }
drivers/md/raid5.c +25 -29
174 lines not on this page · raw message
drivers/media/dvb/ttpci/budget.c +0 -3
@@ -643,9 +643,6 @@ static void frontend_init(struct budget *budget) &budget->i2c_adap, &tt1600_isl6423_config); - }else { -dvb_frontend_detach (budget->dvb_frontend); - budget->dvb_frontend =NULL ; } }break ;
drivers/net/bnx2.c +5 -1
@@ -4752,8 +4752,12 @@ bnx2_reset_chip(struct bnx2 *bp, u32 reset_code) rc =bnx2_alloc_bad_rbuf (bp); } -if (bp->flags &BNX2_FLAG_USING_MSIX ) +if (bp->flags &BNX2_FLAG_USING_MSIX ) {bnx2_setup_msix_tbl (bp); +/* Prevent MSIX table reads and write from timing out */ +REG_WR (bp,BNX2_MISC_ECO_HW_CTL , +BNX2_MISC_ECO_HW_CTL_LARGE_GRC_TMOUT_EN ); + }return rc; }
drivers/net/r8169.c +9 -4
@@ -2832,8 +2832,13 @@ static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr)spin_lock_irq (&tp->lock);RTL_W8 (Cfg9346, Cfg9346_Unlock); -RTL_W32 (MAC0 , low); +RTL_W32 (MAC4 , high); +RTL_R32 (MAC4 ); + +RTL_W32 (MAC0 , low); +RTL_R32 (MAC0 ); +RTL_W8 (Cfg9346, Cfg9346_Lock);spin_unlock_irq (&tp->lock);
@@ -4316,7 +4321,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, tp->cur_tx += frags +1 ; -smp_wmb (); +wmb ();RTL_W8 (TxPoll,NPQ );/* set polling bit */
@@ -4676,7 +4681,7 @@ static int rtl8169_poll(struct napi_struct *napi, int budget)* until it does. */ tp->intr_mask =0xffff ; -smp_wmb (); +wmb ();RTL_W16 (IntrMask, tp->intr_event); }
@@ -4814,8 +4819,8 @@ static void rtl_set_rx_mode(struct net_device *dev) mc_filter[1 ] =swab32 (data); } -RTL_W32 (MAR0 +0 , mc_filter[0 ]);RTL_W32 (MAR0 +4 , mc_filter[1 ]); +RTL_W32 (MAR0 +0 , mc_filter[0 ]);RTL_W32 (RxConfig, tmp);
drivers/net/tg3.c +1 -0
@@ -8168,6 +8168,7 @@ static int tg3_test_msi(struct tg3 *tp)pci_disable_msi (tp->pdev); tp->tg3_flags2 &= ~TG3_FLG2_USING_MSI ; + tp->napi[0 ].irq_vec = tp->pdev->irq; err =tg3_request_irq (tp,0 );if (err)
drivers/net/usb/dm9601.c +1 -1
@@ -238,7 +238,7 @@ static int dm_write_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 valu goto out;dm_write_reg (dev,DM_SHARED_ADDR , phy ? (reg |0x40 ) : reg); -dm_write_reg (dev,DM_SHARED_CTRL , phy ?0x1c :0x14 ); +dm_write_reg (dev,DM_SHARED_CTRL , phy ?0x1a :0x12 );for (i =0 ; i <DM_TIMEOUT ; i++) {u8 tmp;
drivers/net/wireless/p54/p54pci.c +9 -1
@@ -205,6 +205,14 @@ static void p54p_check_rx_ring(struct ieee80211_hw *dev, u32 *index, i %= ring_limit;continue ; } + +if (unlikely (len > priv->common.rx_mtu)) { +if (net_ratelimit ()) +dev_err (&priv->pdev->dev,"rx'd frame size " +"exceeds length threshold.\n" ); + + len = priv->common.rx_mtu; + }skb_put (skb, len);if (p54_rx (dev, skb)) {
@@ -237,7 +245,7 @@ static void p54p_check_tx_ring(struct ieee80211_hw *dev, u32 *index,u32 idx, i; i = (*index) % ring_limit; - (*index) = idx =le32_to_cpu (ring_control->device_idx[1 ]); + (*index) = idx =le32_to_cpu (ring_control->device_idx[ring_index]); idx %= ring_limit;while (i != idx) {
drivers/net/wireless/p54/p54usb.c +1 -0
@@ -36,6 +36,7 @@ static struct usb_device_id p54u_table[] __devinitdata = {/* Version 1 devices (pci chip + net2280) */ {USB_DEVICE(0x0506, 0x0a11)}, /* 3COM 3CRWE254G72 */ {USB_DEVICE(0x0707, 0xee06)}, /* SMC 2862W-G */ + {USB_DEVICE(0x07aa, 0x001c)}, /* Corega CG-WLUSB2GT */ {USB_DEVICE(0x083a, 0x4501)}, /* Accton 802.11g WN4501 USB */ {USB_DEVICE(0x083a, 0x4502)}, /* Siemens Gigaset USB Adapter */ {USB_DEVICE(0x083a, 0x5501)}, /* Phillips CPWUA054 */
drivers/net/wireless/p54/txrx.c +1 -1
@@ -186,7 +186,7 @@ static int p54_tx_qos_accounting_alloc(struct p54_common *priv,struct ieee80211_tx_queue_stats *queue;unsigned long flags; -if (WARN_ON (p54_queue >P54_QUEUE_NUM )) +if (WARN_ON (p54_queue >=P54_QUEUE_NUM ))return -EINVAL ; queue = &priv->tx_stats[p54_queue];
drivers/pci/pci.c +1 -5
@@ -601,7 +601,7 @@ static void __pci_start_power_transition(struct pci_dev *dev, pci_power_t state)*/ int __pci_complete_power_transition (struct pci_dev *dev,pci_power_t state) { -return state >PCI_D0 ? +return state >=PCI_D0 ?pci_platform_power_transition (dev, state) : -EINVAL ; }EXPORT_SYMBOL_GPL (__pci_complete_power_transition);
@@ -638,10 +638,6 @@ int pci_set_power_state(struct pci_dev *dev, pci_power_t state)*/ return 0 ; -/* Check if we're already there */ -if (dev->current_state == state) -return 0 ; -__pci_start_power_transition (dev, state);/* This device is quirked not to be put into D3, so
drivers/scsi/libiscsi.c +1 -1
@@ -384,12 +384,12 @@ static int iscsi_prep_scsi_cmd_pdu(struct iscsi_task *task)WARN_ON (hdrlength >=256 ); hdr->hlength = hdrlength &0xFF ; + hdr->cmdsn = task->cmdsn =cpu_to_be32 (session->cmdsn);if (session->tt->init_task && session->tt->init_task (task))return -EIO ; task->state =ISCSI_TASK_RUNNING ; - hdr->cmdsn = task->cmdsn =cpu_to_be32 (session->cmdsn); session->cmdsn++; conn->scsicmd_pdus_cnt++;
drivers/scsi/libsas/sas_ata.c +4 -0
@@ -394,11 +394,15 @@ int sas_ata_init_host_and_port(struct domain_device *found_dev,void sas_ata_task_abort (struct sas_task *task) {struct ata_queued_cmd *qc = task->uldd_task; +struct request_queue *q = qc->scsicmd->device->request_queue;struct completion *waiting; +unsigned long flags;/* Bounce SCSI-initiated commands to the SCSI EH */ if (qc->scsicmd) { +spin_lock_irqsave (q->queue_lock, flags);blk_abort_request (qc->scsicmd->request); +spin_unlock_irqrestore (q->queue_lock, flags);scsi_schedule_eh (qc->scsicmd->device->host);return ; }
drivers/scsi/libsas/sas_scsi_host.c +4 -0
@@ -1025,6 +1025,8 @@ int __sas_task_abort(struct sas_task *task)void sas_task_abort (struct sas_task *task) {struct scsi_cmnd *sc = task->uldd_task; +struct request_queue *q = sc->device->request_queue; +unsigned long flags;/* Escape for libsas internal commands */ if (!sc) {
@@ -1039,7 +1041,9 @@ void sas_task_abort(struct sas_task *task)return ; } +spin_lock_irqsave (q->queue_lock, flags);blk_abort_request (sc->request); +spin_unlock_irqrestore (q->queue_lock, flags);scsi_schedule_eh (sc->device->host); }
drivers/scsi/qla2xxx/qla_isr.c +57 -63
153 lines not on this page · raw message
drivers/scsi/scsi_debug.c +2 -1
@@ -914,7 +914,8 @@ static int resp_start_stop(struct scsi_cmnd * scp,static sector_t get_sdebug_capacity (void ) {if (scsi_debug_virtual_gb >0 ) -return 2048 *1024 * (sector_t )scsi_debug_virtual_gb; +return (sector_t )scsi_debug_virtual_gb * + (1073741824 / scsi_debug_sector_size);else return sdebug_store_sectors; }
drivers/scsi/scsi_error.c +14 -1
@@ -301,7 +301,20 @@ static int scsi_check_sense(struct scsi_cmnd *scmd)if (scmd->device->allow_restart && (sshdr.asc ==0x04 ) && (sshdr.ascq ==0x02 ))return FAILED ; -return SUCCESS ; + +if (blk_barrier_rq (scmd->request)) +/* +* barrier requests should always retry on UA +* otherwise block will get a spurious error +*/ +return NEEDS_RETRY ; +else +/* +* for normal (non barrier) commands, pass the +* UA upwards for a determination in the +* completion functions +*/ +return SUCCESS ;/* these three are not supported */ case COPY_ABORTED :
drivers/scsi/scsi_lib.c +8 -2
@@ -773,8 +773,14 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)* we already took a copy of the original into rq->errors which * is what gets returned to the user */ -if (sense_valid && sshdr.sense_key ==RECOVERED_ERROR ) { -if (!(req->cmd_flags &REQ_QUIET )) +if (sense_valid && (sshdr.sense_key ==RECOVERED_ERROR )) { +/* if ATA PASS-THROUGH INFORMATION AVAILABLE skip +* print since caller wants ATA registers. Only occurs on +* SCSI ATA PASS_THROUGH commands when CK_COND=1 +*/ +if ((sshdr.asc ==0x0 ) && (sshdr.ascq ==0x1d )) + ; +else if (!(req->cmd_flags &REQ_QUIET ))scsi_print_sense ("" , cmd); result =0 ;/* BLOCK_PC may have set error */
drivers/scsi/sd.c +1 -0
@@ -971,6 +971,7 @@ static void sd_prepare_flush(struct request_queue *q, struct request *rq) { rq->cmd_type =REQ_TYPE_BLOCK_PC ; rq->timeout =SD_TIMEOUT ; + rq->retries =SD_MAX_RETRIES ; rq->cmd[0 ] =SYNCHRONIZE_CACHE ; rq->cmd_len =10 ; }
drivers/serial/8250_pnp.c +2 -0
@@ -348,6 +348,8 @@ static const struct pnp_device_id pnp_dev_table[] = { { "FUJ02E6", 0 },/* Fujitsu Wacom 2FGT Tablet PC device */ { "FUJ02E7", 0 }, +/* Fujitsu Wacom 1FGT Tablet PC device */ + { "FUJ02E9", 0 },/* * LG C1 EXPRESS DUAL (C1-PB11A3) touch screen (actually a FUJ02E6 in * disguise)
drivers/staging/hv/Hv.c +1 -1
@@ -306,9 +306,9 @@ void HvCleanup(void)DPRINT_ENTER (VMBUS );if (gHvContext.SignalEventBuffer) { +kfree (gHvContext.SignalEventBuffer); gHvContext.SignalEventBuffer =NULL ; gHvContext.SignalEventParam =NULL ; -kfree (gHvContext.SignalEventBuffer); }if (gHvContext.GuestId ==HV_LINUX_GUEST_ID ) {
drivers/staging/hv/RndisFilter.c +1 -0
@@ -756,6 +756,7 @@ static int RndisFilterOpenDevice(struct rndis_device *Device) ret =RndisFilterSetPacketFilter (Device,NDIS_PACKET_TYPE_BROADCAST | +NDIS_PACKET_TYPE_ALL_MULTICAST |NDIS_PACKET_TYPE_DIRECTED );if (ret ==0 ) Device->State =RNDIS_DEV_DATAINITIALIZED ;
drivers/staging/hv/netvsc_drv.c +1 -2
@@ -413,8 +413,7 @@ static int netvsc_probe(struct device *device)if (!net_drv_obj->Base.OnDeviceAdd)return -1 ; - net =alloc_netdev (sizeof (struct net_device_context ),"seth%d" , - ether_setup); + net =alloc_etherdev (sizeof (struct net_device_context ));if (!net)return -1 ;
drivers/staging/usbip/usbip_event.c +3 -0
@@ -117,6 +117,9 @@ void usbip_stop_eh(struct usbip_device *ud) {struct usbip_task *eh = &ud->eh; +if (eh->thread == current) +return ;/* do not wait for myself */ +wait_for_completion (&eh->thread_done);usbip_dbg_eh ("usbip_eh has finished\n" ); }
drivers/usb/core/driver.c +30 -2
@@ -1175,9 +1175,8 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg) udev->state == USB_STATE_SUSPENDED) goto done; - udev->do_remote_wakeup =device_may_wakeup (&udev->dev); -if (msg.event &PM_EVENT_AUTO ) { + udev->do_remote_wakeup =device_may_wakeup (&udev->dev); status =autosuspend_check (udev,0 );if (status <0 ) goto done;
@@ -1742,6 +1741,34 @@ int usb_external_resume_device(struct usb_device *udev, pm_message_t msg)return status; } +static void choose_wakeup (struct usb_device *udev,pm_message_t msg) +{ +int w, i; +struct usb_interface *intf; + +/* Remote wakeup is needed only when we actually go to sleep. +* For things like FREEZE and QUIESCE, if the device is already +* autosuspended then its current wakeup setting is okay. +*/ +if (msg.event ==PM_EVENT_FREEZE || msg.event ==PM_EVENT_QUIESCE ) { + udev->do_remote_wakeup =0 ; +return ; + } + +/* If remote wakeup is permitted, see whether any interface drivers +* actually want it. +*/ + w =0 ; +if (device_may_wakeup (&udev->dev) && udev->actconfig) { +for (i =0 ; i < udev->actconfig->desc.bNumInterfaces; i++) { + intf = udev->actconfig->interface[i]; + w |= intf->needs_remote_wakeup; + } + } + + udev->do_remote_wakeup = w; +} +int usb_suspend (struct device *dev,pm_message_t msg) {struct usb_device *udev;
@@ -1761,6 +1788,7 @@ int usb_suspend(struct device *dev, pm_message_t msg) } udev->skip_sys_resume =0 ; +choose_wakeup (udev, msg);return usb_external_suspend_device (udev, msg); }
drivers/usb/core/generic.c +1 -1
@@ -120,7 +120,7 @@ int usb_choose_configuration(struct usb_device *udev)* than a vendor-specific driver. */ else if (udev->descriptor.bDeviceClass != USB_CLASS_VENDOR_SPEC && - (!desc || desc->bInterfaceClass != + (desc && desc->bInterfaceClass !=USB_CLASS_VENDOR_SPEC )) { best = c;break ;
drivers/usb/core/inode.c +2 -2
@@ -515,13 +515,13 @@ static int fs_create_by_name (const char *name, mode_t mode, *dentry =NULL ;mutex_lock (&parent->d_inode->i_mutex); *dentry =lookup_one_len (name, parent,strlen (name)); -if (!IS_ERR (dentry)) { +if (!IS_ERR (*dentry)) {if ((mode &S_IFMT ) ==S_IFDIR ) error =usbfs_mkdir (parent->d_inode, *dentry, mode);else error =usbfs_create (parent->d_inode, *dentry, mode); }else - error =PTR_ERR (dentry); + error =PTR_ERR (*dentry);mutex_unlock (&parent->d_inode->i_mutex);return error;
drivers/usb/host/ehci-hcd.c +1 -0
@@ -543,6 +543,7 @@ static int ehci_init(struct usb_hcd *hcd)*/ ehci->periodic_size =DEFAULT_I_TDPS ;INIT_LIST_HEAD (&ehci->cached_itd_list); +INIT_LIST_HEAD (&ehci->cached_sitd_list);if ((retval =ehci_mem_init (ehci,GFP_KERNEL )) <0 )return retval;
drivers/usb/host/ehci-mem.c +1 -1
@@ -136,7 +136,7 @@ static inline void qh_put (struct ehci_qh *qh)static void ehci_mem_cleanup (struct ehci_hcd *ehci) { -free_cached_itd_list (ehci); +free_cached_lists (ehci);if (ehci->async)qh_put (ehci->async); ehci->async =NULL ;
drivers/usb/host/ehci-sched.c +30 -8
@@ -2127,13 +2127,27 @@ sitd_complete ( (stream->bEndpointAddress & USB_DIR_IN) ? "in" : "out"); }iso_stream_put (ehci, stream); -/* OK to recycle this SITD now that its completion callback ran. */ + done: sitd->urb =NULL ; - sitd->stream =NULL ; -list_move (&sitd->sitd_list, &stream->free_list); -iso_stream_put (ehci, stream); - +if (ehci->clock_frame != sitd->frame) { +/* OK to recycle this SITD now. */ + sitd->stream =NULL ; +list_move (&sitd->sitd_list, &stream->free_list); +iso_stream_put (ehci, stream); + }else { +/* HW might remember this SITD, so we can't recycle it yet. +* Move it to a safe place until a new frame starts. +*/ +list_move (&sitd->sitd_list, &ehci->cached_sitd_list); +if (stream->refcount ==2 ) { +/* If iso_stream_put() were called here, stream +* would be freed. Instead, just prevent reuse. +*/ + stream->ep->hcpriv =NULL ; + stream->ep =NULL ; + } + }return retval; }
@@ -2199,9 +2213,10 @@ done:/*-------------------------------------------------------------------------*/ -static void free_cached_itd_list (struct ehci_hcd *ehci) +static void free_cached_lists (struct ehci_hcd *ehci) {struct ehci_itd *itd, *n; +struct ehci_sitd *sitd, *sn;list_for_each_entry_safe (itd, n, &ehci->cached_itd_list, itd_list) {struct ehci_iso_stream *stream = itd->stream;
@@ -2209,6 +2224,13 @@ static void free_cached_itd_list(struct ehci_hcd *ehci)list_move (&itd->itd_list, &stream->free_list);iso_stream_put (ehci, stream); } + +list_for_each_entry_safe (sitd, sn, &ehci->cached_sitd_list, sitd_list) { +struct ehci_iso_stream *stream = sitd->stream; + sitd->stream =NULL ; +list_move (&sitd->sitd_list, &stream->free_list); +iso_stream_put (ehci, stream); + } }/*-------------------------------------------------------------------------*/
@@ -2235,7 +2257,7 @@ scan_periodic (struct ehci_hcd *ehci) clock_frame =-1 ; }if (ehci->clock_frame != clock_frame) { -free_cached_itd_list (ehci); +free_cached_lists (ehci); ehci->clock_frame = clock_frame; } clock %= mod;
@@ -2398,7 +2420,7 @@ restart: clock = now; clock_frame = clock >>3 ;if (ehci->clock_frame != clock_frame) { -free_cached_itd_list (ehci); +free_cached_lists (ehci); ehci->clock_frame = clock_frame; } }else {
drivers/usb/host/ehci.h +3 -2
@@ -87,8 +87,9 @@ struct ehci_hcd { /* one per controller */int next_uframe;/* scan periodic, start here */ unsigned periodic_sched;/* periodic activity count */ -/* list of itds completed while clock_frame was still active */ +/* list of itds & sitds completed while clock_frame was still active */ struct list_head cached_itd_list; +struct list_head cached_sitd_list;unsigned clock_frame;/* per root hub port */
@@ -195,7 +196,7 @@ timer_action_done (struct ehci_hcd *ehci, enum ehci_timer_action action)clear_bit (action, &ehci->actions); } -static void free_cached_itd_list (struct ehci_hcd *ehci); +static void free_cached_lists (struct ehci_hcd *ehci);/*-------------------------------------------------------------------------*/
drivers/usb/host/ohci-hub.c +1 -1
@@ -697,7 +697,7 @@ static int ohci_hub_control (u16 wLength ) {struct ohci_hcd *ohci =hcd_to_ohci (hcd); -int ports =hcd_to_bus (hcd)->root_hub->maxchild; +int ports = ohci->num_ports;u32 temp;int retval =0 ;
drivers/usb/host/xhci-mem.c +65 -0
95 lines not on this page · raw message
drivers/usb/host/xhci.h +4 -0
@@ -609,6 +609,10 @@ struct xhci_ep_ctx {#define MAX_PACKET_MASK (0xffff << 16)#define MAX_PACKET_DECODED (p) (((p) >> 16) & 0xffff) +/* tx_info bitmasks */ +#define AVG_TRB_LENGTH_FOR_EP (p) ((p) & 0xffff) +#define MAX_ESIT_PAYLOAD_FOR_EP (p) (((p) & 0xffff) << 16) +/** * struct xhci_input_control_context
drivers/usb/serial/sierra.c +1 -0
@@ -195,6 +195,7 @@ static const struct sierra_iface_info direct_ip_interface_blacklist = {static struct usb_device_id id_table [] = { {USB_DEVICE (0x0F3D ,0x0112 ) },/* Airprime/Sierra PC 5220 */ {USB_DEVICE (0x03F0 ,0x1B1D ) },/* HP ev2200 a.k.a MC5720 */ + {USB_DEVICE (0x03F0 ,0x211D ) },/* HP ev2210 a.k.a MC5725 */ {USB_DEVICE (0x03F0 ,0x1E1D ) },/* HP hs2300 a.k.a MC8775 */ {USB_DEVICE (0x1199 ,0x0017 ) },/* Sierra Wireless EM5625 */
drivers/w1/slaves/w1_therm.c +2 -3
@@ -115,9 +115,8 @@ static struct w1_therm_family_converter w1_therm_families[] = {static inline int w1_DS18B20_convert_temp (u8 rom[9 ]) { -int t = ((s16 )rom[1 ] <<8 ) | rom[0 ]; - t = t*1000 /16 ; -return t; +s16 t =le16_to_cpup ((__le16 *)rom); +return t*1000 /16 ; }static inline int w1_DS18S20_convert_temp (u8 rom[9 ])
fs/ext4/extents.c +7 -2
@@ -3711,7 +3711,6 @@ int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, __u64 start, __u64 len) {ext4_lblk_t start_blk; -ext4_lblk_t len_blks;int error =0 ;/* fallback to generic here if not in extents fmt */
@@ -3725,8 +3724,14 @@ int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,if (fieinfo->fi_flags &FIEMAP_FLAG_XATTR ) { error =ext4_xattr_fiemap (inode, fieinfo); }else { +ext4_lblk_t len_blks; +__u64 last_blk; + start_blk = start >> inode->i_sb->s_blocksize_bits; - len_blks = len >> inode->i_sb->s_blocksize_bits; + last_blk = (start + len -1 ) >> inode->i_sb->s_blocksize_bits; +if (last_blk >=EXT_MAX_BLOCK ) + last_blk =EXT_MAX_BLOCK -1 ; + len_blks = ((ext4_lblk_t ) last_blk) - start_blk +1 ;/* * Walk the extent tree gathering extent information.
fs/jfs/resize.c +5 -1
@@ -81,6 +81,7 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize)struct inode *iplist[1 ];struct jfs_superblock *j_sb, *j_sb2;uint old_agsize; +int agsizechanged =0 ;struct buffer_head *bh, *bh2;/* If the volume hasn't grown, get out now */
@@ -333,6 +334,9 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize)*/ if ((rc =dbExtendFS (ipbmap, XAddress, nblocks))) goto error_out; + + agsizechanged |= (bmp->db_agsize != old_agsize); +/* * the map now has extended to cover additional nblocks: * dn_mapsize = oldMapsize + nblocks;
@@ -432,7 +436,7 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize)* will correctly identify the new ag); */ /* if new AG size the same as old AG size, done! */ -if (bmp->db_agsize != old_agsize) { +if (agsizechanged) {if ((rc =diExtendFS (ipimap, ipbmap))) goto error_out;
fs/nfs/client.c +2 -0
@@ -965,6 +965,8 @@ out_error:static void nfs_server_copy_userdata (struct nfs_server *target,struct nfs_server *source) { target->flags = source->flags; + target->rsize = source->rsize; + target->wsize = source->wsize; target->acregmin = source->acregmin; target->acregmax = source->acregmax; target->acdirmin = source->acdirmin;
fs/nfs/dir.c +2 -0
@@ -837,6 +837,8 @@ out_zap_parent:/* If we have submounts, don't unhash ! */ if (have_submounts (dentry)) goto out_valid; +if (dentry->d_flags &DCACHE_DISCONNECTED ) + goto out_valid;shrink_dcache_parent (dentry); }d_drop (dentry);
fs/nfsd/nfs4xdr.c +4 -4
@@ -168,10 +168,10 @@ static __be32 *read_buf(struct nfsd4_compoundargs *argp, u32 nbytes) argp->p =page_address (argp->pagelist[0 ]); argp->pagelist++;if (argp->pagelen <PAGE_SIZE ) { - argp->end = p + (argp->pagelen>>2 ); + argp->end = argp->p + (argp->pagelen>>2 ); argp->pagelen =0 ; }else { - argp->end = p + (PAGE_SIZE >>2 ); + argp->end = argp->p + (PAGE_SIZE >>2 ); argp->pagelen -=PAGE_SIZE ; }memcpy (((char *)p)+avail, argp->p, (nbytes - avail));
@@ -1433,10 +1433,10 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) argp->p =page_address (argp->pagelist[0 ]); argp->pagelist++;if (argp->pagelen <PAGE_SIZE ) { - argp->end = p + (argp->pagelen>>2 ); + argp->end = argp->p + (argp->pagelen>>2 ); argp->pagelen =0 ; }else { - argp->end = p + (PAGE_SIZE >>2 ); + argp->end = argp->p + (PAGE_SIZE >>2 ); argp->pagelen -=PAGE_SIZE ; } }
fs/ocfs2/buffer_head_io.c +2 -0
@@ -407,6 +407,7 @@ int ocfs2_write_super_or_backup(struct ocfs2_super *osb, struct buffer_head *bh) {int ret =0 ; +struct ocfs2_dinode *di = (struct ocfs2_dinode *)bh->b_data;mlog_entry_void ();
@@ -426,6 +427,7 @@ int ocfs2_write_super_or_backup(struct ocfs2_super *osb,get_bh (bh);/* for end_buffer_write_sync() */ bh->b_end_io = end_buffer_write_sync; +ocfs2_compute_meta_ecc (osb->sb, bh->b_data, &di->i_check);submit_bh (WRITE , bh);wait_on_buffer (bh);
fs/ocfs2/dlm/dlmfs.c +1 -1
@@ -205,7 +205,7 @@ static ssize_t dlmfs_file_read(struct file *filp,if ((count + *ppos) >i_size_read (inode)) readlen =i_size_read (inode) - *ppos;else - readlen = count - *ppos; + readlen = count; lvb_buf =kmalloc (readlen,GFP_NOFS );if (!lvb_buf)
fs/ocfs2/inode.c +1 -0
@@ -559,6 +559,7 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb, handle =ocfs2_start_trans (osb,OCFS2_INODE_UPDATE_CREDITS );if (IS_ERR (handle)) { status =PTR_ERR (handle); + handle =NULL ;mlog_errno (status); goto out; }
fs/ocfs2/refcounttree.c +3 -0
@@ -3995,6 +3995,9 @@ static int ocfs2_complete_reflink(struct inode *s_inode, di->i_attr = s_di->i_attr;if (preserve) { + t_inode->i_uid = s_inode->i_uid; + t_inode->i_gid = s_inode->i_gid; + t_inode->i_mode = s_inode->i_mode; di->i_uid = s_di->i_uid; di->i_gid = s_di->i_gid; di->i_mode = s_di->i_mode;
fs/proc/base.c +1 -1
@@ -2844,7 +2844,7 @@ out_no_task:*/ static const struct pid_entry tid_base_stuff[] = {DIR ("fd" ,S_IRUSR |S_IXUSR , proc_fd_inode_operations, proc_fd_operations), -DIR ("fdinfo" ,S_IRUSR |S_IXUSR , proc_fdinfo_inode_operations, proc_fd_operations), +DIR ("fdinfo" ,S_IRUSR |S_IXUSR , proc_fdinfo_inode_operations, proc_fdinfo_operations),REG ("environ" ,S_IRUSR , proc_environ_operations),INF ("auxv" ,S_IRUSR , proc_pid_auxv),ONE ("status" ,S_IRUGO , proc_pid_status),
fs/reiserfs/dir.c +0 -2
@@ -45,8 +45,6 @@ static inline bool is_privroot_deh(struct dentry *dir, struct reiserfs_de_head *deh) {struct dentry *privroot =REISERFS_SB (dir->d_sb)->priv_root; -if (reiserfs_expose_privroot (dir->d_sb)) -return 0 ;return (dir == dir->d_parent && privroot->d_inode && deh->deh_objectid ==INODE_PKEY (privroot->d_inode)->k_objectid); }
fs/reiserfs/xattr.c +5 -14
@@ -536,7 +536,7 @@ reiserfs_xattr_set_handle(struct reiserfs_transaction_handle *th,if (!err && new_size <i_size_read (dentry->d_inode)) {struct iattr newattrs = { .ia_ctime =current_fs_time (inode->i_sb), - .ia_size = buffer_size, + .ia_size = new_size, .ia_valid =ATTR_SIZE |ATTR_CTIME , };mutex_lock_nested (&dentry->d_inode->i_mutex,I_MUTEX_XATTR );
@@ -952,21 +952,13 @@ int reiserfs_permission(struct inode *inode, int mask)return generic_permission (inode, mask,NULL ); } -/* This will catch lookups from the fs root to .reiserfs_priv */ -static int -xattr_lookup_poison (struct dentry *dentry,struct qstr *q1,struct qstr *name) +static int xattr_hide_revalidate (struct dentry *dentry,struct nameidata *nd) { -struct dentry *priv_root =REISERFS_SB (dentry->d_sb)->priv_root; - if (container_of(q1, struct dentry, d_name) == priv_root) -return -ENOENT ; -if (q1->len == name->len && - !memcmp (q1->name, name->name, name->len)) -return 0 ; -return 1 ; +return -EPERM ; }static const struct dentry_operations xattr_lookup_poison_ops = { - .d_compare = xattr_lookup_poison, + .d_revalidate = xattr_hide_revalidate, };int reiserfs_lookup_privroot (struct super_block *s)
@@ -980,8 +972,7 @@ int reiserfs_lookup_privroot(struct super_block *s) strlen(PRIVROOT_NAME));if (!IS_ERR (dentry)) {REISERFS_SB (s)->priv_root = dentry; -if (!reiserfs_expose_privroot (s)) - s->s_root->d_op = &xattr_lookup_poison_ops; + dentry->d_op = &xattr_lookup_poison_ops;if (dentry->d_inode) dentry->d_inode->i_flags |=S_PRIVATE ; }else
fs/xfs/linux-2.6/xfs_super.c +5 -0
@@ -1164,6 +1164,7 @@ xfs_fs_put_super(xfs_unmountfs (mp);xfs_freesb (mp); +xfs_inode_shrinker_unregister (mp);xfs_icsb_destroy_counters (mp);xfs_close_devices (mp);xfs_dmops_put (mp);
@@ -1555,6 +1556,8 @@ xfs_fs_fill_super(if (error) goto fail_vnrele; +xfs_inode_shrinker_register (mp); +kfree (mtpt);xfs_itrace_exit (XFS_I (sb->s_root->d_inode));
@@ -1894,6 +1897,7 @@ init_xfs_fs(void) goto out_cleanup_procfs;vfs_initquota (); +xfs_inode_shrinker_init (); error =register_filesystem (&xfs_fs_type);if (error)
@@ -1923,6 +1927,7 @@ exit_xfs_fs(void) {vfs_exitquota ();unregister_filesystem (&xfs_fs_type); +xfs_inode_shrinker_destroy ();xfs_sysctl_unregister ();xfs_cleanup_procfs ();xfs_buf_terminate ();
fs/xfs/linux-2.6/xfs_sync.c +100 -7
168 lines not on this page · raw message
fs/xfs/linux-2.6/xfs_sync.h +6 -1
@@ -54,6 +54,11 @@ void __xfs_inode_clear_reclaim_tag(struct xfs_mount *mp, struct xfs_perag *pag,int xfs_sync_inode_valid (struct xfs_inode *ip,struct xfs_perag *pag);int xfs_inode_ag_iterator (struct xfs_mount *mp,int (*execute)(struct xfs_inode *ip,struct xfs_perag *pag,int flags), -int flags,int tag,int write_lock); +int flags,int tag,int write_lock,int *nr_to_scan); + +void xfs_inode_shrinker_init (void ); +void xfs_inode_shrinker_destroy (void ); +void xfs_inode_shrinker_register (struct xfs_mount *mp); +void xfs_inode_shrinker_unregister (struct xfs_mount *mp);#endif
fs/xfs/quota/xfs_qm_syscalls.c +2 -1
@@ -893,7 +893,8 @@ xfs_qm_dqrele_all_inodes( uint flags) {ASSERT (mp->m_quotainfo); -xfs_inode_ag_iterator (mp, xfs_dqrele_inode, flags,XFS_ICI_NO_TAG ,0 ); +xfs_inode_ag_iterator (mp, xfs_dqrele_inode, flags, +XFS_ICI_NO_TAG ,0 ,NULL ); }/*------------------------------------------------------------------------*/
fs/xfs/xfs_ag.h +1 -0
@@ -215,6 +215,7 @@ typedef struct xfs_peragint pag_ici_init;/* incore inode cache initialised */ rwlock_t pag_ici_lock;/* incore inode lock */ struct radix_tree_root pag_ici_root;/* incore inode cache root */ +int pag_ici_reclaimable;/* reclaimable inodes */ #endif } xfs_perag_t;
fs/xfs/xfs_mount.h +1 -0
@@ -243,6 +243,7 @@ typedef struct xfs_mount {wait_queue_head_t m_wait_single_sync_task;__int64_t m_update_flags;/* sb flags we need to update on the next remount,rw */ +struct list_head m_mplist;/* inode shrinker mount list */ } xfs_mount_t;/*
include/linux/acpi.h +1 -0
@@ -251,6 +251,7 @@ int acpi_check_mem_region(resource_size_t start, resource_size_t n,void __init acpi_no_s4_hw_signature (void );void __init acpi_old_suspend_ordering (void );void __init acpi_s4_no_nvs (void ); +void __init acpi_set_sci_en_on_resume (void );#endif /* CONFIG_PM_SLEEP */ struct acpi_osc_context {
include/linux/ata.h +2 -2
@@ -1000,8 +1000,8 @@ static inline int ata_ok(u8 status)static inline int lba_28_ok (u64 block,u32 n_block) { -/* check the ending block number */ -return ((block + n_block) < ((u64 )1 <<28 )) && (n_block <=256 ); +/* check the ending block number: must be LESS THAN 0x0fffffff */ +return ((block + n_block) < ((1 <<28 ) -1 )) && (n_block <=256 ); }static inline int lba_48_ok (u64 block,u32 n_block)
include/linux/poison.h +23 -2
@@ -2,13 +2,25 @@#define _LINUX_POISON_H/********** include/linux/list.h **********/ + +/* +* Architectures might want to move the poison pointer offset +* into some well-recognized area such as 0xdead000000000000, +* that is also not mappable by user-space exploits: +*/ +#ifdef CONFIG_ILLEGAL_POINTER_VALUE +# define POISON_POINTER_DELTA _AC(CONFIG_ILLEGAL_POINTER_VALUE, UL) +#else +# define POISON_POINTER_DELTA 0 +#endif +/* * These are non-NULL pointers that will result in page faults * under normal circumstances, used to verify that nobody uses * non-initialized list entries. */ -#define LIST_POISON1 ((void *) 0x00100100) -#define LIST_POISON2 ((void *) 0x00200200) +#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA) +#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)/********** include/linux/timer.h **********/ /*
@@ -36,6 +48,15 @@#define POISON_FREE 0x6b/* for use-after-free poisoning */ #define POISON_END 0xa5/* end-byte of poisoning */ +/********** mm/hugetlb.c **********/ +/* +* Private mappings of hugetlb pages use this poisoned value for +* page->mapping. The core VM should not be doing anything with this mapping +* but futex requires the existence of some page->mapping value even though it +* is unused if PAGE_MAPPING_ANON is set. +*/ +#define HUGETLB_POISON ((void *)(0x00300300 + POISON_POINTER_DELTA + PAGE_MAPPING_ANON)) +/********** arch/$ARCH/mm/init.c **********/ #define POISON_FREE_INITMEM 0xcc
include/linux/syscalls.h +4 -2
@@ -153,7 +153,8 @@ static void prof_sysexit_disable_##sname(void) \#define __SC_STR_TDECL6 (t, a, ...) #t, __SC_STR_TDECL5(__VA_ARGS__)#define SYSCALL_TRACE_ENTER_EVENT (sname) \ - static struct ftrace_event_call event_enter_##sname; \ + static struct ftrace_event_call \ + __attribute__((__aligned__(4))) event_enter_##sname; \ struct trace_event enter_syscall_print_##sname = { \ .trace = print_syscall_enter, \ }; \
@@ -189,7 +190,8 @@ static void prof_sysexit_disable_##sname(void) \ }#define SYSCALL_TRACE_EXIT_EVENT (sname) \ - static struct ftrace_event_call event_exit_##sname; \ + static struct ftrace_event_call \ + __attribute__((__aligned__(4))) event_exit_##sname; \ struct trace_event exit_syscall_print_##sname = { \ .trace = print_syscall_exit, \ }; \
include/trace/ftrace.h +2 -1
@@ -43,7 +43,8 @@tstruct \ char __data[0]; \ }; \ - static struct ftrace_event_call event_##name + static struct ftrace_event_call \ + __attribute__((__aligned__(4))) event_##name#undef __cpparg #define __cpparg(arg...) arg
init/initramfs.c +2 -1
@@ -455,7 +455,8 @@ static char * __init unpack_to_rootfs(char *buf, unsigned len) compress_name); message = msg_buf; } - } + }else +error ("junk in compressed archive" );if (state != Reset)error ("junk in compressed archive" ); this_header = saved_offset + my_inptr;
kernel/cred.c +0 -2
@@ -786,8 +786,6 @@ bool creds_are_invalid(const struct cred *cred) {if (cred->magic !=CRED_MAGIC )return true; -if (atomic_read (&cred->usage) <atomic_read (&cred->subscribers)) -return true;#ifdef CONFIG_SECURITY_SELINUX if (selinux_is_enabled ()) {if ((unsigned long ) cred->security <PAGE_SIZE )
kernel/perf_event.c +1 -1
@@ -4609,7 +4609,7 @@ err_fput_free_put_context: err_free_put_context:if (err <0 ) -kfree (event); +free_event (event); err_put_context:if (err <0 )
kernel/trace/trace.h +2 -1
@@ -746,7 +746,8 @@ extern const char *__stop___trace_bprintk_fmt[];#undef FTRACE_ENTRY#define FTRACE_ENTRY (call, struct_name, id, tstruct, print) \ - extern struct ftrace_event_call event_##call; + extern struct ftrace_event_call \ + __attribute__((__aligned__(4))) event_##call;#undef FTRACE_ENTRY_DUP#define FTRACE_ENTRY_DUP (call, struct_name, id, tstruct, print) \ FTRACE_ENTRY(call, struct_name, id, PARAMS(tstruct), PARAMS(print))
lib/flex_array.c +1 -1
@@ -99,7 +99,7 @@ struct flex_array *flex_array_alloc(int element_size, unsigned int total, ret->element_size = element_size; ret->total_nr_elements = total;if (elements_fit_in_base (ret) && !(flags & __GFP_ZERO)) -memset (ret->parts[0 ],FLEX_ARRAY_FREE , +memset (&ret->parts[0 ],FLEX_ARRAY_FREE ,FLEX_ARRAY_BASE_BYTES_LEFT );return ret; }
mm/hugetlb.c +4 -1
@@ -545,6 +545,7 @@ static void free_huge_page(struct page *page) mapping = (struct address_space *)page_private (page);set_page_private (page,0 ); + page->mapping =NULL ;BUG_ON (page_count (page));INIT_LIST_HEAD (&page->lru);
@@ -2095,8 +2096,10 @@ retry:spin_lock (&inode->i_lock); inode->i_blocks +=blocks_per_huge_page (h);spin_unlock (&inode->i_lock); - }else + }else {lock_page (page); + page->mapping =HUGETLB_POISON ; + } }/*
mm/memcontrol.c +2 -2
@@ -2008,12 +2008,12 @@ int mem_cgroup_prepare_migration(struct page *page, struct mem_cgroup **ptr) }unlock_page_cgroup (pc); + *ptr = mem;if (mem) { - ret =__mem_cgroup_try_charge (NULL ,GFP_KERNEL , &mem, false, + ret =__mem_cgroup_try_charge (NULL ,GFP_KERNEL , ptr, false, page);css_put (&mem->css); } - *ptr = mem;return ret; }
net/dccp/probe.c +2 -1
@@ -164,7 +164,8 @@ static __init int dccpprobe_init(void)if (!proc_net_fops_create (&init_net, procname,S_IRUSR , &dccpprobe_fops)) goto err0; - ret =register_jprobe (&dccp_send_probe); + ret =try_then_request_module ((register_jprobe (&dccp_send_probe) ==0 ), +"dccp" );if (ret) goto err1;
net/mac80211/agg-tx.c +0 -1
@@ -181,7 +181,6 @@ static void sta_addba_resp_timer_expired(unsigned long data) HT_AGG_STATE_REQ_STOP_BA_MSK)) != HT_ADDBA_REQUESTED_MSK) {spin_unlock_bh (&sta->lock); - *state =HT_AGG_STATE_IDLE ;#ifdef CONFIG_MAC80211_HT_DEBUG printk(KERN_DEBUG "timer expired on tid %d but we are not " "(or no longer) expecting addBA response there",
security/inode.c +2 -2
@@ -168,13 +168,13 @@ static int create_by_name(const char *name, mode_t mode,mutex_lock (&parent->d_inode->i_mutex); *dentry =lookup_one_len (name, parent,strlen (name)); -if (!IS_ERR (dentry)) { +if (!IS_ERR (*dentry)) {if ((mode &S_IFMT ) ==S_IFDIR ) error =mkdir (parent->d_inode, *dentry, mode);else error =create (parent->d_inode, *dentry, mode); }else - error =PTR_ERR (dentry); + error =PTR_ERR (*dentry);mutex_unlock (&parent->d_inode->i_mutex);return error;
security/keys/request_key.c +8 -1
@@ -336,8 +336,10 @@ static int construct_alloc_key(struct key_type *type, key_already_present:mutex_unlock (&key_construction_mutex); -if (dest_keyring) +if (dest_keyring) { +__key_link (dest_keyring,key_ref_to_ptr (key_ref));up_write (&dest_keyring->sem); + }mutex_unlock (&user->cons_lock);key_put (key); *_key = key =key_ref_to_ptr (key_ref);
@@ -428,6 +430,11 @@ struct key *request_key_and_link(struct key_type *type,if (!IS_ERR (key_ref)) { key =key_ref_to_ptr (key_ref); +if (dest_keyring) { +construct_get_dest_keyring (&dest_keyring); +key_link (dest_keyring, key); +key_put (dest_keyring); + } }else if (PTR_ERR (key_ref) != -EAGAIN ) { key =ERR_CAST (key_ref); }else {
sound/pci/hda/hda_intel.c +1 -0
@@ -2236,6 +2236,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = {SND_PCI_QUIRK (0x1462 ,0x1002 ,"MSI Wind U115" ,POS_FIX_LPIB ),SND_PCI_QUIRK (0x1565 ,0x820f ,"Biostar Microtech" ,POS_FIX_LPIB ),SND_PCI_QUIRK (0x1565 ,0x8218 ,"Biostar Microtech" ,POS_FIX_LPIB ), +SND_PCI_QUIRK (0x8086 ,0x2503 ,"DG965OT AAD63733-203" ,POS_FIX_LPIB ), SND_PCI_QUIRK(0x8086, 0xd601, "eMachines T5212", POS_FIX_LPIB), {} };
sound/pci/hda/patch_conexant.c +7 -3
@@ -1175,9 +1175,11 @@ static int patch_cxt5045(struct hda_codec *codec)switch (codec->subsystem_id >>16 ) {case 0x103c : -/* HP laptop has a really bad sound over 0dB on NID 0x17. -* Fix max PCM level to 0 dB -* (originall it has 0x2b steps with 0dB offset 0x14) +case 0x1631 : +case 0x1734 : +/* HP, Packard Bell, & Fujitsu-Siemens laptops have really bad +* sound over 0dB on NID 0x17. Fix max PCM level to 0 dB +* (originally it has 0x2b steps with 0dB offset 0x14) */ snd_hda_override_amp_caps(codec, 0x17, HDA_INPUT, (0x14 << AC_AMPCAP_OFFSET_SHIFT) |
@@ -2348,6 +2350,8 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = {SND_PCI_QUIRK (0x1028 ,0x02f5 ,"Dell" ,CXT5066_DELL_LAPTOP ),SND_PCI_QUIRK (0x152d ,0x0833 ,"OLPC XO-1.5" ,CXT5066_OLPC_XO_1_5 ), +SND_PCI_QUIRK (0x1179 ,0xff50 ,"Toshiba Satellite P500-PSPGSC-01800T" ,CXT5066_OLPC_XO_1_5 ), + SND_PCI_QUIRK(0x1179, 0xffe0, "Toshiba Satellite Pro T130-15F", CXT5066_OLPC_XO_1_5), {} };
sound/pci/hda/patch_realtek.c +1 -1
@@ -3971,7 +3971,7 @@ static struct snd_pci_quirk alc880_cfg_tbl[] = {SND_PCI_QUIRK (0x1695 ,0x4012 ,"EPox EP-5LDA" ,ALC880_5ST_DIG ),SND_PCI_QUIRK (0x1734 ,0x107c ,"FSC F1734" ,ALC880_F1734 ),SND_PCI_QUIRK (0x1734 ,0x1094 ,"FSC Amilo M1451G" ,ALC880_FUJITSU ), -SND_PCI_QUIRK (0x1734 ,0x10ac ,"FSC" ,ALC880_UNIWILL ), +SND_PCI_QUIRK (0x1734 ,0x10ac ,"FSC AMILO Xi 1526" ,ALC880_F1734 ),SND_PCI_QUIRK (0x1734 ,0x10b0 ,"Fujitsu" ,ALC880_FUJITSU ),SND_PCI_QUIRK (0x1854 ,0x0018 ,"LG LW20" ,ALC880_LG_LW ), SND_PCI_QUIRK(0x1854, 0x003b, "LG", ALC880_LG),
sound/pci/hda/patch_sigmatel.c +6 -0
@@ -1592,6 +1592,10 @@ static struct snd_pci_quirk stac92hd73xx_cfg_tbl[] = { "Dell Studio 1555", STAC_DELL_M6_DMIC), SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02bd, "Dell Studio 1557", STAC_DELL_M6_DMIC), + SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02fe, + "Dell Studio XPS 1645", STAC_DELL_M6_BOTH), + SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0413, + "Dell Studio 1558", STAC_DELL_M6_BOTH), {}/* terminator */ };
@@ -1712,6 +1716,8 @@ static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = { "HP HDX", STAC_HP_HDX), /* HDX16 */SND_PCI_QUIRK_MASK (PCI_VENDOR_ID_HP ,0xfff0 ,0x3620 ,"HP dv6" ,STAC_HP_DV5 ), +SND_PCI_QUIRK (PCI_VENDOR_ID_HP ,0x3061 , +"HP dv6" ,STAC_HP_DV5 ),/* HP dv6-1110ax */ SND_PCI_QUIRK_MASK (PCI_VENDOR_ID_HP ,0xfff0 ,0x7010 ,"HP" ,STAC_HP_DV5 ), SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233,
sound/pci/maestro3.c +9 -0
@@ -849,6 +849,7 @@ struct snd_m3 {struct snd_kcontrol *master_switch;struct snd_kcontrol *master_volume;struct tasklet_struct hwvol_tq; +unsigned int in_suspend;#ifdef CONFIG_PM u16 *suspend_mem;
@@ -884,6 +885,7 @@ static struct pci_device_id snd_m3_ids[] = {MODULE_DEVICE_TABLE (pci, snd_m3_ids);static struct snd_pci_quirk m3_amp_quirk_list[]__devinitdata = { +SND_PCI_QUIRK (0x0E11 ,0x0094 ,"Compaq Evo N600c" ,0x0c ),SND_PCI_QUIRK (0x10f7 ,0x833e ,"Panasonic CF-28" ,0x0d ),SND_PCI_QUIRK (0x10f7 ,0x833d ,"Panasonic CF-72" ,0x0d ),SND_PCI_QUIRK (0x1033 ,0x80f1 ,"NEC LM800J/7" ,0x03 ),
@@ -1613,6 +1615,11 @@ static void snd_m3_update_hw_volume(unsigned long private_data)outb (0x88 , chip->iobase +SHADOW_MIX_REG_MASTER );outb (0x88 , chip->iobase +HW_VOL_COUNTER_MASTER ); +/* Ignore spurious HV interrupts during suspend / resume, this avoids +mistaking them for a mute button press. */ +if (chip->in_suspend) +return ; +if (!chip->master_switch || !chip->master_volume)return ;
@@ -2424,6 +2431,7 @@ static int m3_suspend(struct pci_dev *pci, pm_message_t state)if (chip->suspend_mem ==NULL )return 0 ; + chip->in_suspend =1 ;snd_power_change_state (card, SNDRV_CTL_POWER_D3hot);snd_pcm_suspend_all (chip->pcm);snd_ac97_suspend (chip->ac97);
@@ -2497,6 +2505,7 @@ static int m3_resume(struct pci_dev *pci)snd_m3_hv_init (chip);snd_power_change_state (card,SNDRV_CTL_POWER_D0 ); + chip->in_suspend =0 ; return 0; }#endif /* CONFIG_PM */