Linux 2.6.33.4
Subsystems (65)
I'm announcing the release of the 2.6.33.4 kernel.
All users of the 2.6.33 kernel series should upgrade.
Many thanks to maximilian attems for all of his work in submitting patches for this release, it is much appreciated.
The updated 2.6.33.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.33.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.33.y.git;a=summarythanks,
greg k-h
------------
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/powerpc/kernel/head_64.S | 11 + arch/powerpc/mm/fsl_booke_mmu.c | 5 arch/powerpc/platforms/pseries/hotplug-cpu.c | 42 ++----- arch/powerpc/platforms/pseries/offline_states.h | 1 arch/sparc/include/asm/irqflags_64.h | 23 +++ arch/sparc/include/asm/thread_info_64.h | 2 arch/sparc/kernel/pci_common.c | 11 + arch/sparc/kernel/rtrap_64.S | 12 +- arch/sparc/kernel/traps_64.c | 26 ---- arch/sparc/kernel/unaligned_64.c | 6 - arch/x86/Kconfig | 4 arch/x86/kernel/apic/io_apic.c | 3 arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 3 arch/x86/kernel/cpu/intel.c | 21 +++ arch/x86/kernel/k8.c | 14 ++ arch/x86/kernel/pci-gart_64.c | 2 arch/x86/kernel/process_64.c | 4 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 | 144 ++++++++++++++++++++++++ drivers/ata/libata-eh.c | 5 drivers/base/memory.c | 2 drivers/char/agp/Kconfig | 2 drivers/cpuidle/governors/menu.c | 9 - drivers/edac/edac_mce_amd.c | 5 drivers/gpu/drm/i915/i915_debugfs.c | 2 drivers/gpu/drm/i915/i915_dma.c | 16 +- drivers/gpu/drm/i915/i915_drv.h | 26 ++++ drivers/gpu/drm/i915/i915_gem.c | 8 + drivers/gpu/drm/i915/i915_gem_tiling.c | 24 +--- drivers/gpu/drm/i915/i915_irq.c | 18 +-- drivers/gpu/drm/i915/i915_reg.h | 2 drivers/gpu/drm/i915/intel_bios.c | 3 drivers/gpu/drm/i915/intel_crt.c | 14 +- drivers/gpu/drm/i915/intel_display.c | 56 ++++----- drivers/gpu/drm/i915/intel_lvds.c | 2 drivers/gpu/drm/i915/intel_overlay.c | 2 drivers/i2c/i2c-core.c | 21 ++- 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/sfc/efx.c | 4 drivers/net/sfc/falcon.c | 4 drivers/net/sfc/falcon_boards.c | 13 -- drivers/net/sfc/nic.h | 2 drivers/net/sfc/siena.c | 13 +- drivers/net/tg3.c | 1 drivers/net/tun.c | 4 drivers/net/usb/cdc_ether.c | 1 drivers/net/usb/dm9601.c | 2 drivers/net/wan/hdlc_ppp.c | 6 + drivers/net/wireless/ath/ath9k/main.c | 2 drivers/net/wireless/p54/p54pci.c | 2 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/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/core/message.c | 2 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/ata.h | 4 include/linux/poison.h | 9 + include/net/sctp/command.h | 1 include/net/sctp/sctp.h | 1 init/initramfs.c | 3 kernel/cred.c | 2 kernel/perf_event.c | 2 lib/flex_array.c | 2 mm/hugetlb.c | 5 mm/memcontrol.c | 4 net/ieee802154/af_ieee802154.c | 3 net/ipv4/tcp.c | 1 net/ipv4/udp.c | 4 net/ipv6/tcp_ipv6.c | 2 net/ipv6/udp.c | 4 net/mac80211/agg-tx.c | 1 net/sctp/associola.c | 6 - net/sctp/endpointola.c | 1 net/sctp/sm_make_chunk.c | 32 +---- net/sctp/sm_sideeffect.c | 26 ++++ net/sctp/sm_statefuns.c | 8 + net/sctp/socket.c | 14 ++ net/tipc/bearer.c | 37 +----- net/tipc/bearer.h | 2 net/tipc/net.c | 25 ---- security/inode.c | 4 security/keys/request_key.c | 9 + sound/pci/hda/hda_intel.c | 1 sound/pci/hda/patch_conexant.c | 7 - sound/pci/hda/patch_realtek.c | 2 sound/pci/hda/patch_sigmatel.c | 6 + sound/pci/maestro3.c | 9 + 139 files changed, 988 insertions(+), 405 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
Ben Hutchings (3):
sfc: Wait at most 10ms for the MC to finish reading out MAC statistics
sfc: Always close net device at the end of a disabling reset
sfc: Change falcon_probe_board() to fail for unsupported boards
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
Changli Gao (1):
flex_array: fix the panic when calling flex_array_alloc() without __GFP_ZERO
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 (7):
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 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
David S. Miller (6):
sparc64: Use correct pt_regs in decode_access_size() error paths.
sparc64: Fix PREEMPT_ACTIVE value.
sparc64: Fix hardirq tracing in trap return path.
sparc64: Use kstack_valid() in die_if_kernel().
sparc64: Adjust __raw_local_irq_save() to cooperate in NMIs.
sparc64: Fix memory leak in pci_register_iommu_region().
Douglas Gilbert (2):
skip sense logging for some ATA PASS-THROUGH cdbs
scsi_debug: virtual_gb ignores sector_size
Eric Anholt (1):
drm/i915: Add initial bits for VGA modesetting bringup on Sandybridge.
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.33.4
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
Herbert Xu (1):
ipv6: Fix tcp_v6_send_response transport header setting.
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 (2):
reiserfs: fix permissions on .reiserfs_priv
reiserfs: fix corruption during shrinking of xattrs
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
John W. Linville (1):
ath9k: reorder ieee80211_free_hw behind ath9k_uninit_hw to avoid oops
Jorge Boncompte [DTI2] (1):
udp: fix for unicast RX path optimization
Kamal Mostafa (1):
ACPI: sleep: init_set_sci_en_on_resume for Dell Studio 155x
Krzysztof Halasa (1):
WAN: flush tx_queue in hdlc_ppp to prevent panic on rmmod hw_driver.
Kunal Gangakhedkar (1):
ALSA: hda - Add PCI quirk for HP dv6-1110ax.
Leonard Michlmayr (1):
ext4: correctly calculate number of blocks for fiemap
Linus Torvalds (1):
Revert "memory-hotplug: add 0x prefix to HEX block_size_bytes"
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.
Michael S. Tsirkin (1):
tun: orphan an skb on tx
Mike Christie (1):
SCSI: libiscsi: regression: fix header digest errors
Neil Brown (1):
nfsd4: bug in read_buf
Neil Horman (1):
tipc: Fix oops on send prior to entering networked mode (v3)
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: Fix NULL pointer access in irq_force_complete_move() for Xen guests
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
Roel Kluin (1):
USB: don't read past config->interface[] if usb_control_msg() fails in usb_reset_configuration()
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.
Stefan Schmidt (1):
ieee802154: Fix oops during ieee802154_sock_ioctl
Stephen Hemminger (1):
Staging: hv: name network device ethX rather than sethX
Steven J. Magnani (1):
net: Fix oops from tcp_collapse() when using splice()
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()
Torgny Johansson (1):
cdc_ether: fix autosuspend for mbm devices
Vaidyanathan Srinivasan (3):
powerpc: Reset kernel stack on cpu online from cede state
powerpc: Move checks in pseries_mach_cpu_die()
powerpc: Reduce printk from pseries_mach_cpu_die()
Vlad Yasevich (3):
sctp: fix potential reference of a freed pointer
sctp: per_cpu variables should be in bh_disabled section
sctp: Fix oops when sending queued ASCONF chunks
Wei Yongjun (2):
sctp: avoid irq lock inversion while call sk->sk_data_ready()
sctp: fix to calc the INIT/INIT-ACK chunk length correctly is set
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
françois romieu (1):
r8169: more broken register writes workaround
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 33 -EXTRAVERSION = .3 +EXTRAVERSION = .4 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/powerpc/kernel/head_64.S +11 -0
@@ -615,6 +615,17 @@ _GLOBAL(start_secondary_prolog) std r3,0(r1) /* Zero the stack frame pointer */ bl .start_secondary b . +/* + * Reset stack pointer and call start_secondary + * to continue with online operation when woken up + * from cede in cpu offline. + */ +_GLOBAL(start_secondary_resume) + ld r1,PACAKSAVE(r13) /* Reload kernel stack pointer */ + li r3,0 + std r3,0(r1) /* Zero the stack frame pointer */ + bl .start_secondary + b . #endif /*
arch/powerpc/mm/fsl_booke_mmu.c +0 -5
@@ -155,15 +155,10 @@ static void settlbcam(int index, unsigned long virt, phys_addr_t phys,if (cur_cpu_spec->cpu_features &MMU_FTR_BIG_PHYS )TLBCAM [index].MAS7 = (u64 )phys >>32 ; -#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/powerpc/platforms/pseries/hotplug-cpu.c +15 -27
59 lines not on this page · raw message
arch/powerpc/platforms/pseries/offline_states.h +1 -0
@@ -35,4 +35,5 @@ static inline void set_default_offline_state(int cpu)extern enum cpu_state_vals get_preferred_offline_state (int cpu);extern int start_secondary (void ); +extern void start_secondary_resume (void );#endif
arch/sparc/include/asm/irqflags_64.h +20 -3
@@ -76,9 +76,26 @@ static inline int raw_irqs_disabled(void)*/ static inline unsigned long __raw_local_irq_save (void ) { -unsigned long flags =__raw_local_save_flags (); - -raw_local_irq_disable (); +unsigned long flags, tmp; + +/* Disable interrupts to PIL_NORMAL_MAX unless we already +* are using PIL_NMI, in which case PIL_NMI is retained. +* +* The only values we ever program into the %pil are 0, +* PIL_NORMAL_MAX and PIL_NMI. +* +* Since PIL_NMI is the largest %pil value and all bits are +* set in it (0xf), it doesn't matter what PIL_NORMAL_MAX +* actually is. +*/ + __asm__ __volatile__( +"rdpr %%pil, %0\n\t" +"or %0, %2, %1\n\t" +"wrpr %1, 0x0, %%pil" + :"=r" (flags),"=r" (tmp) + :"i" (PIL_NORMAL_MAX ) + :"memory" + );return flags; }
arch/sparc/include/asm/thread_info_64.h +1 -1
@@ -121,7 +121,7 @@ struct thread_info {#define THREAD_SHIFT PAGE_SHIFT#endif /* PAGE_SHIFT == 13 */ -#define PREEMPT_ACTIVE 0x4000000 +#define PREEMPT_ACTIVE 0x10000000/* * macros/functions for gaining access to the thread information structure
arch/sparc/kernel/pci_common.c +8 -3
@@ -371,14 +371,19 @@ static void pci_register_iommu_region(struct pci_pbm_info *pbm)struct resource *rp =kzalloc (sizeof (*rp),GFP_KERNEL );if (!rp) { -prom_printf ("Cannot allocate IOMMU resource.\n" ); -prom_halt (); +pr_info ("%s: Cannot allocate IOMMU resource.\n" , + pbm->name); +return ; } rp->name ="IOMMU" ; rp->start = pbm->mem_space.start + (unsigned long ) vdma[0 ]; rp->end = rp->start + (unsigned long ) vdma[1 ] -1UL ; rp->flags =IORESOURCE_BUSY ; -request_resource (&pbm->mem_space, rp); +if (request_resource (&pbm->mem_space, rp)) { +pr_info ("%s: Unable to request IOMMU resource.\n" , + pbm->name); +kfree (rp); + } } }
arch/sparc/kernel/rtrap_64.S +11 -1
@@ -172,7 +172,17 @@ rtrap_xcall: nop call trace_hardirqs_on nop - wrpr %l4, %pil + /* Do not actually set the %pil here. We will do that + * below after we clear PSTATE_IE in the %pstate register. + * If we re-enable interrupts here, we can recurse down + * the hardirq stack potentially endlessly, causing a + * stack overflow. + * + * It is tempting to put this test and trace_hardirqs_on + * call at the 'rt_continue' label, but that will not work + * as that path hits unconditionally and we do not want to + * execute this in NMI return paths, for example. + */ #endif rtrap_no_irq_enable: andcc %l1, TSTATE_PRIV, %l3
arch/sparc/kernel/traps_64.c +3 -23
@@ -2202,27 +2202,6 @@ void dump_stack(void)EXPORT_SYMBOL (dump_stack); -static inline int is_kernel_stack (struct task_struct *task, -struct reg_window *rw) -{ -unsigned long rw_addr = (unsigned long ) rw; -unsigned long thread_base, thread_end; - -if (rw_addr <PAGE_OFFSET ) { -if (task != &init_task) -return 0 ; - } - - thread_base = (unsigned long )task_stack_page (task); - thread_end = thread_base +sizeof (union thread_union ); -if (rw_addr >= thread_base && - rw_addr < thread_end && - !(rw_addr &0x7UL )) -return 1 ; - -return 0 ; -} -static inline struct reg_window *kernel_stack_up (struct reg_window *rw) {unsigned long fp = rw->ins[6 ];
@@ -2251,6 +2230,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)show_regs (regs);add_taint (TAINT_DIE );if (regs->tstate &TSTATE_PRIV ) { +struct thread_info *tp =current_thread_info ();struct reg_window *rw = (struct reg_window *) (regs->u_regs[UREG_FP ] +STACK_BIAS );
@@ -2258,8 +2238,8 @@ void die_if_kernel(char *str, struct pt_regs *regs)* find some badly aligned kernel stack. */ while (rw && - count++ <30 && -is_kernel_stack (current, rw)) { + count++ <30 && +kstack_valid (tp, (unsigned long ) rw)) {printk ("Caller[%016lx]: %pS\n" , rw->ins[7 ], (void *) rw->ins[7 ]);
arch/sparc/kernel/unaligned_64.c +3 -3
@@ -49,7 +49,7 @@ static inline enum direction decode_direction(unsigned int insn) }/* 16 = double-word, 8 = extra-word, 4 = word, 2 = half-word */ -static inline int decode_access_size (unsigned int insn) +static inline int decode_access_size (struct pt_regs *regs,unsigned int insn) {unsigned int tmp;
@@ -65,7 +65,7 @@ static inline int decode_access_size(unsigned int insn)return 2 ; else {printk ("Impossible unaligned trap. insn=%08x\n" , insn); -die_if_kernel ("Byte sized unaligned access?!?!" ,current_thread_info ()->kregs); +die_if_kernel ("Byte sized unaligned access?!?!" , regs);/* GCC should never warn that control reaches the end * of this function without returning a value because
@@ -289,7 +289,7 @@ static void log_unaligned(struct pt_regs *regs) asmlinkage void kernel_unaligned_trap(struct pt_regs *regs, unsigned int insn) {enum direction dir =decode_direction (insn); -int size =decode_access_size (insn); +int size =decode_access_size (regs, insn);int orig_asi, asi;current_thread_info ()->kern_una_regs = regs;
arch/x86/Kconfig +2 -2
@@ -627,7 +627,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,
@@ -2026,7 +2026,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/apic/io_apic.c +3 -0
@@ -2539,6 +2539,9 @@ void irq_force_complete_move(int irq)struct irq_desc *desc =irq_to_desc (irq);struct irq_cfg *cfg = desc->chip_data; +if (!cfg) +return ; + __irq_complete_move(&desc, cfg->vector); }#else
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/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
@@ -738,7 +738,7 @@ int __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 0 ;#ifndef CONFIG_AGP_AMD64
arch/x86/kernel/process_64.c +2 -2
@@ -282,12 +282,12 @@ 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; p->thread.io_bitmap_ptr =NULL ;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);
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 +144 -0
156 lines not on this page · raw message
drivers/ata/libata-eh.c +5 -0
@@ -879,6 +879,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);
@@ -890,7 +892,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); }/**
@@ -1624,6 +1628,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/base/memory.c +1 -1
@@ -311,7 +311,7 @@ static SYSDEV_ATTR(removable, 0444, show_mem_removable, NULL);static ssize_t print_block_size (struct class *class,char *buf) { -return sprintf (buf,"%#lx\n" , (unsigned long )PAGES_PER_SECTION *PAGE_SIZE ); +return sprintf (buf,"%lx\n" , (unsigned long )PAGES_PER_SECTION *PAGE_SIZE ); } static CLASS_ATTR(block_size_bytes, 0444, print_block_size, NULL);
drivers/char/agp/Kconfig +1 -1
@@ -57,7 +57,7 @@ config AGP_AMD config AGP_AMD64 tristate "AMD Opteron/Athlon64 on-CPU GART support" - depends on AGP && X86 + depends on AGP && X86 && K8_NB help This option gives you AGP support for the GLX component of X using the on-CPU northbridge of the AMD Athlon64/Opteron CPUs.
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
@@ -294,7 +294,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 ;
@@ -324,7 +323,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);
@@ -374,7 +373,7 @@ static int amd_decode_mce(struct notifier_block *nb, unsigned long val, ((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_debugfs.c +1 -1
@@ -162,7 +162,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)struct drm_device *dev = node->minor->dev;drm_i915_private_t *dev_priv = dev->dev_private; -if (!IS_IRONLAKE (dev)) { +if (!HAS_PCH_SPLIT (dev)) {seq_printf (m,"Interrupt enable: %08x\n" ,I915_READ (IER )); seq_printf(m, "Interrupt identity: %08x\n",
drivers/gpu/drm/i915/i915_dma.c +11 -5
@@ -978,15 +978,21 @@ static int i915_probe_agp(struct drm_device *dev, uint32_t *aperture_size,* Some of the preallocated space is taken by the GTT * and popup. GTT is 1K per MB of aperture size, and popup is 4K. */ -if (IS_G4X (dev) ||IS_PINEVIEW (dev) ||IS_IRONLAKE (dev)) +if (IS_G4X (dev) ||IS_PINEVIEW (dev) ||IS_IRONLAKE (dev) ||IS_GEN6 (dev)) overhead =4096 ;else overhead = (*aperture_size /1024 ) +4096 ;switch (tmp &INTEL_GMCH_GMS_MASK ) {case INTEL_855_GMCH_GMS_DISABLED : -DRM_ERROR ("video memory is disabled\n" ); -return -1 ; +/* XXX: This is what my A1 silicon has. */ +if (IS_GEN6 (dev)) { + stolen =64 *1024 *1024 ; + }else { +DRM_ERROR ("video memory is disabled\n" ); +return -1 ; + } +break ;case INTEL_855_GMCH_GMS_STOLEN_1M : stolen =1 *1024 *1024 ;break ;
@@ -1064,7 +1070,7 @@ static unsigned long i915_gtt_to_phys(struct drm_device *dev,int gtt_offset, gtt_size;if (IS_I965G (dev)) { -if (IS_G4X (dev) ||IS_IRONLAKE (dev)) { +if (IS_G4X (dev) ||IS_IRONLAKE (dev) ||IS_GEN6 (dev)) { gtt_offset =2 *1024 *1024 ; gtt_size =2 *1024 *1024 ; }else {
@@ -1445,7 +1451,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) dev->driver->get_vblank_counter = i915_get_vblank_counter; dev->max_vblank_count =0xffffff ;/* only 24 bits of frame count */ -if (IS_G4X (dev) ||IS_IRONLAKE (dev)) { +if (IS_G4X (dev) ||IS_IRONLAKE (dev) ||IS_GEN6 (dev)) { dev->max_vblank_count =0xffffffff ;/* full 32 bit counter */ dev->driver->get_vblank_counter = gm45_get_vblank_counter; }
drivers/gpu/drm/i915/i915_drv.h +25 -1
@@ -1026,7 +1026,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);#define IS_845G (dev) ((dev)->pci_device == 0x2562)#define IS_I85X (dev) ((dev)->pci_device == 0x3582)#define IS_I865G (dev) ((dev)->pci_device == 0x2572) -#define IS_I8XX (dev) (INTEL_INFO(dev)->is_i8xx) +#define IS_GEN2 (dev) (INTEL_INFO(dev)->is_i8xx)#define IS_I915G (dev) (INTEL_INFO(dev)->is_i915g)#define IS_I915GM (dev) ((dev)->pci_device == 0x2592)#define IS_I945G (dev) ((dev)->pci_device == 0x2772)
@@ -1045,8 +1045,29 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);#define IS_I9XX (dev) (INTEL_INFO(dev)->is_i9xx)#define IS_MOBILE (dev) (INTEL_INFO(dev)->is_mobile) +#define IS_GEN3 (dev) (IS_I915G(dev) || \ + IS_I915GM(dev) || \ + IS_I945G(dev) || \ + IS_I945GM(dev) || \ + IS_G33(dev) || \ + IS_PINEVIEW(dev)) +#define IS_GEN4 (dev) ((dev)->pci_device == 0x2972 || \ + (dev)->pci_device == 0x2982 || \ + (dev)->pci_device == 0x2992 || \ + (dev)->pci_device == 0x29A2 || \ + (dev)->pci_device == 0x2A02 || \ + (dev)->pci_device == 0x2A12 || \ + (dev)->pci_device == 0x2E02 || \ + (dev)->pci_device == 0x2E12 || \ + (dev)->pci_device == 0x2E22 || \ + (dev)->pci_device == 0x2E32 || \ + (dev)->pci_device == 0x2A42 || \ + (dev)->pci_device == 0x2E42) +#define I915_NEED_GFX_HWS (dev) (INTEL_INFO(dev)->need_gfx_hws) +#define IS_GEN6 (dev) ((dev)->pci_device == 0x0102) +/* With the 945 and later, Y tiling got adjusted so that it was 32 128-byte * rows, which changed the alignment requirements and fence programming. */
@@ -1067,6 +1088,9 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);#define I915_HAS_FBC (dev) (INTEL_INFO(dev)->has_fbc)#define I915_HAS_RC6 (dev) (INTEL_INFO(dev)->has_rc6) +#define HAS_PCH_SPLIT (dev) (IS_IRONLAKE(dev) || \ + IS_GEN6(dev)) +#define PRIMARY_RINGBUFFER_SIZE (128*1024)#endif
drivers/gpu/drm/i915/i915_gem.c +7 -1
@@ -1819,7 +1819,7 @@ i915_do_wait_request(struct drm_device *dev, uint32_t seqno, int interruptible)return -EIO ;if (!i915_seqno_passed (i915_get_gem_seqno (dev), seqno)) { -if (IS_IRONLAKE (dev)) +if (HAS_PCH_SPLIT (dev)) ier =I915_READ (DEIER ) |I915_READ (GTIER );else ier =I915_READ (IER );
@@ -2316,6 +2316,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 +10 -14
@@ -209,7 +209,7 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)uint32_t swizzle_y =I915_BIT_6_SWIZZLE_UNKNOWN ;bool need_disable; -if (IS_IRONLAKE (dev)) { +if (IS_IRONLAKE (dev) ||IS_GEN6 (dev)) {/* On Ironlake whatever DRAM config, GPU always do * same swizzling setup. */
@@ -357,21 +357,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_GEN3 (dev) ||IS_GEN2 (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_GEN3 (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_irq.c +9 -9
@@ -576,7 +576,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)atomic_inc (&dev_priv->irq_received); -if (IS_IRONLAKE (dev)) +if (HAS_PCH_SPLIT (dev))return ironlake_irq_handler (dev); iir =I915_READ (IIR );
@@ -737,7 +737,7 @@ void i915_user_irq_get(struct drm_device *dev)spin_lock_irqsave (&dev_priv->user_irq_lock, irqflags);if (dev->irq_enabled && (++dev_priv->user_irq_refcount ==1 )) { -if (IS_IRONLAKE (dev)) +if (HAS_PCH_SPLIT (dev))ironlake_enable_graphics_irq (dev_priv,GT_USER_INTERRUPT );else i915_enable_irq (dev_priv,I915_USER_INTERRUPT );
@@ -753,7 +753,7 @@ void i915_user_irq_put(struct drm_device *dev)spin_lock_irqsave (&dev_priv->user_irq_lock, irqflags);BUG_ON (dev->irq_enabled && dev_priv->user_irq_refcount <=0 );if (dev->irq_enabled && (--dev_priv->user_irq_refcount ==0 )) { -if (IS_IRONLAKE (dev)) +if (HAS_PCH_SPLIT (dev))ironlake_disable_graphics_irq (dev_priv,GT_USER_INTERRUPT );else i915_disable_irq (dev_priv,I915_USER_INTERRUPT );
@@ -861,7 +861,7 @@ int i915_enable_vblank(struct drm_device *dev, int pipe)return -EINVAL ;spin_lock_irqsave (&dev_priv->user_irq_lock, irqflags); -if (IS_IRONLAKE (dev)) +if (HAS_PCH_SPLIT (dev))ironlake_enable_display_irq (dev_priv, (pipe ==0 ) ?DE_PIPEA_VBLANK :DE_PIPEB_VBLANK );else if (IS_I965G (dev))
@@ -883,7 +883,7 @@ void i915_disable_vblank(struct drm_device *dev, int pipe)unsigned long irqflags;spin_lock_irqsave (&dev_priv->user_irq_lock, irqflags); -if (IS_IRONLAKE (dev)) +if (HAS_PCH_SPLIT (dev))ironlake_disable_display_irq (dev_priv, (pipe ==0 ) ?DE_PIPEA_VBLANK :DE_PIPEB_VBLANK );else
@@ -897,7 +897,7 @@ void i915_enable_interrupt (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; -if (!IS_IRONLAKE (dev)) +if (!HAS_PCH_SPLIT (dev))opregion_enable_asle (dev); dev_priv->irq_enabled =1 ; }
@@ -1076,7 +1076,7 @@ void i915_driver_irq_preinstall(struct drm_device * dev)INIT_WORK (&dev_priv->hotplug_work, i915_hotplug_work_func);INIT_WORK (&dev_priv->error_work, i915_error_work_func); -if (IS_IRONLAKE (dev)) { +if (HAS_PCH_SPLIT (dev)) {ironlake_irq_preinstall (dev);return ; }
@@ -1108,7 +1108,7 @@ int i915_driver_irq_postinstall(struct drm_device *dev) dev_priv->vblank_pipe =DRM_I915_VBLANK_PIPE_A |DRM_I915_VBLANK_PIPE_B ; -if (IS_IRONLAKE (dev)) +if (HAS_PCH_SPLIT (dev))return ironlake_irq_postinstall (dev);/* Unmask the interrupts that we always want on. */
@@ -1196,7 +1196,7 @@ void i915_driver_irq_uninstall(struct drm_device * dev) dev_priv->vblank_pipe =0 ; -if (IS_IRONLAKE (dev)) { +if (HAS_PCH_SPLIT (dev)) {ironlake_irq_uninstall (dev);return ; }
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -221,7 +221,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/gpu/drm/i915/intel_bios.c +2 -1
@@ -247,6 +247,7 @@ static void parse_general_features(struct drm_i915_private *dev_priv, struct bdb_header *bdb) { + struct drm_device *dev = dev_priv->dev;struct bdb_general_features *general;/* Set sensible defaults in case we can't find the general block */
@@ -263,7 +264,7 @@ parse_general_features(struct drm_i915_private *dev_priv,if (IS_I85X (dev_priv->dev)) dev_priv->lvds_ssc_freq = general->ssc_freq ?66 :48 ; -else if (IS_IRONLAKE (dev_priv->dev)) +else if (IS_IRONLAKE (dev_priv->dev) ||IS_GEN6 (dev)) dev_priv->lvds_ssc_freq = general->ssc_freq ?100 :120 ;else
drivers/gpu/drm/i915/intel_crt.c +7 -7
@@ -39,7 +39,7 @@ static void intel_crt_dpms(struct drm_encoder *encoder, int mode)struct drm_i915_private *dev_priv = dev->dev_private;u32 temp, reg; -if (IS_IRONLAKE (dev)) +if (HAS_PCH_SPLIT (dev)) reg =PCH_ADPA ;else reg =ADPA ;
@@ -113,7 +113,7 @@ static void intel_crt_mode_set(struct drm_encoder *encoder,else dpll_md_reg =DPLL_B_MD ; -if (IS_IRONLAKE (dev)) +if (HAS_PCH_SPLIT (dev)) adpa_reg =PCH_ADPA ;else adpa_reg =ADPA ;
@@ -122,7 +122,7 @@ static void intel_crt_mode_set(struct drm_encoder *encoder,* Disable separate mode multiplier used when cloning SDVO to CRT * XXX this needs to be adjusted when we really are cloning */ -if (IS_I965G (dev) && !IS_IRONLAKE (dev)) { +if (IS_I965G (dev) && !HAS_PCH_SPLIT (dev)) { dpll_md =I915_READ (dpll_md_reg);I915_WRITE (dpll_md_reg, dpll_md & ~DPLL_MD_UDI_MULTIPLIER_MASK );
@@ -136,11 +136,11 @@ static void intel_crt_mode_set(struct drm_encoder *encoder,if (intel_crtc->pipe ==0 ) { adpa |=ADPA_PIPE_A_SELECT ; -if (!IS_IRONLAKE (dev)) +if (!HAS_PCH_SPLIT (dev))I915_WRITE (BCLRPAT_A ,0 ); }else { adpa |=ADPA_PIPE_B_SELECT ; -if (!IS_IRONLAKE (dev)) +if (!HAS_PCH_SPLIT (dev))I915_WRITE (BCLRPAT_B ,0 ); }
@@ -202,7 +202,7 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector)u32 hotplug_en;int i, tries =0 ; -if (IS_IRONLAKE (dev)) +if (HAS_PCH_SPLIT (dev))return intel_ironlake_crt_detect_hotplug (connector);/*
@@ -524,7 +524,7 @@ void intel_crt_init(struct drm_device *dev) &intel_output->enc);/* Set up the DDC bus. */ -if (IS_IRONLAKE (dev)) +if (HAS_PCH_SPLIT (dev)) i2c_reg =PCH_GPIOA ;else { i2c_reg =GPIOA ;
drivers/gpu/drm/i915/intel_display.c +28 -28
224 lines not on this page · raw message
drivers/gpu/drm/i915/intel_lvds.c +1 -1
@@ -661,7 +661,7 @@ static enum drm_connector_status intel_lvds_detect(struct drm_connector *connect/* ACPI lid methods were generally unreliable in this generation, so * don't even bother. */ -if (IS_I8XX (dev)) +if (IS_GEN2 (dev))return connector_status_connected;if (!dmi_check_system (bad_lid_status) && !acpi_lid_open ())
drivers/gpu/drm/i915/intel_overlay.c +1 -1
@@ -172,7 +172,7 @@ struct overlay_registers {#define OFC_UPDATE 0x1#define OVERLAY_NONPHYSICAL (dev) (IS_G33(dev) || IS_I965G(dev)) -#define OVERLAY_EXISTS (dev) (!IS_G4X(dev) && !IS_IRONLAKE(dev)) +#define OVERLAY_EXISTS (dev) (!IS_G4X(dev) && !IS_IRONLAKE(dev) && !IS_GEN6(dev))static struct overlay_registers *intel_overlay_map_regs_atomic (struct intel_overlay *overlay)
drivers/i2c/i2c-core.c +16 -5
@@ -1210,12 +1210,23 @@ static int i2c_detect_address(struct i2c_client *temp_client,return 0 ;/* Make sure there is something at this address */ -if (i2c_smbus_xfer (adapter, addr,0 ,0 ,0 ,I2C_SMBUS_QUICK ,NULL ) <0 ) -return 0 ; +if (addr ==0x73 && (adapter->class &I2C_CLASS_HWMON )) { +/* Special probe for FSC hwmon chips */ +union i2c_smbus_data dummy; -/* Prevent 24RF08 corruption */ -if ((addr & ~0x0f ) ==0x50 ) -i2c_smbus_xfer (adapter, addr,0 ,0 ,0 ,I2C_SMBUS_QUICK ,NULL ); +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 */ memset (&info,0 ,sizeof (struct i2c_board_info ));
drivers/md/md.c +8 -2
@@ -2108,12 +2108,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
@@ -4772,8 +4772,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 */
@@ -4675,7 +4680,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); }
@@ -4813,8 +4818,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/sfc/efx.c +2 -2
@@ -1862,6 +1862,7 @@ out: }if (disabled) { +dev_close (efx->net_dev);EFX_ERR (efx,"has been disabled\n" ); efx->state =STATE_DISABLED ; }else {
@@ -1885,8 +1886,7 @@ static void efx_reset_work(struct work_struct *data) }rtnl_lock (); -if (efx_reset (efx, efx->reset_pending)) -dev_close (efx->net_dev); + (void )efx_reset (efx, efx->reset_pending);rtnl_unlock (); }
drivers/net/sfc/falcon.c +3 -1
@@ -1317,7 +1317,9 @@ static int falcon_probe_nvconfig(struct efx_nic *efx)EFX_LOG (efx,"PHY is %d phy_id %d\n" , efx->phy_type, efx->mdio.prtad); -falcon_probe_board (efx, board_rev); + rc =falcon_probe_board (efx, board_rev); +if (rc) + goto fail2;kfree (nvconfig);return 0 ;
drivers/net/sfc/falcon_boards.c +3 -10
@@ -728,15 +728,7 @@ static const struct falcon_board_type board_types[] = { }, }; -static const struct falcon_board_type falcon_dummy_board = { - .init = efx_port_dummy_op_int, - .init_phy = efx_port_dummy_op_void, - .fini = efx_port_dummy_op_void, - .set_id_led = efx_port_dummy_op_set_id_led, - .monitor = efx_port_dummy_op_int, -}; - -void falcon_probe_board (struct efx_nic *efx,u16 revision_info) +int falcon_probe_board (struct efx_nic *efx,u16 revision_info) {struct falcon_board *board =falcon_board (efx);u8 type_id =FALCON_BOARD_TYPE (revision_info);
@@ -754,8 +746,9 @@ void falcon_probe_board(struct efx_nic *efx, u16 revision_info) (efx->pci_dev->subsystem_vendor ==EFX_VENDID_SFC ) ? board->type->ref_model : board->type->gen_type, 'A' + board->major, board->minor); +return 0 ; }else {EFX_ERR (efx,"unknown board type %d\n" , type_id); - board->type = &falcon_dummy_board; +return -ENODEV ; } }
drivers/net/sfc/nic.h +1 -1
@@ -156,7 +156,7 @@ extern struct efx_nic_type siena_a0_nic_type;************************************************************************** */ -extern void falcon_probe_board (struct efx_nic *efx,u16 revision_info); +extern int falcon_probe_board (struct efx_nic *efx,u16 revision_info);/* TX data path */ extern int efx_nic_probe_tx (struct efx_tx_queue *tx_queue);
drivers/net/sfc/siena.c +11 -2
@@ -454,8 +454,17 @@ static int siena_try_update_nic_stats(struct efx_nic *efx)static void siena_update_nic_stats (struct efx_nic *efx) { -while (siena_try_update_nic_stats (efx) == -EAGAIN ) -cpu_relax (); +int retry; + +/* If we're unlucky enough to read statistics wduring the DMA, wait +* up to 10ms for it to finish (typically takes <500us) */ +for (retry =0 ; retry <100 ; ++retry) { +if (siena_try_update_nic_stats (efx) ==0 ) +return ; +udelay (100 ); + } + +/* Use the old values instead */ }static void siena_start_nic_stats (struct efx_nic *efx)
drivers/net/tg3.c +1 -0
@@ -8572,6 +8572,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/tun.c +4 -0
@@ -380,6 +380,10 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev) } } +/* Orphan the skb - required as we might hang on to it +* for indefinite time. */ +skb_orphan (skb); +/* Enqueue packet */ skb_queue_tail (&tun->socket.sk->sk_receive_queue, skb); dev->trans_start = jiffies;
drivers/net/usb/cdc_ether.c +1 -0
@@ -433,6 +433,7 @@ static const struct driver_info mbm_info = { .bind = cdc_bind, .unbind = usbnet_cdc_unbind, .status = cdc_status, + .manage_power = cdc_manage_power, };/*-------------------------------------------------------------------------*/
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/wan/hdlc_ppp.c +6 -0
@@ -628,9 +628,15 @@ static void ppp_stop(struct net_device *dev)ppp_cp_event (dev,PID_LCP ,STOP ,0 ,0 ,0 ,NULL ); } +static void ppp_close (struct net_device *dev) +{ +ppp_tx_flush (); +} +static struct hdlc_proto proto = { .start = ppp_start, .stop = ppp_stop, + .close = ppp_close, .type_trans = ppp_type_trans, .ioctl = ppp_ioctl, .netif_rx = ppp_rx,
drivers/net/wireless/ath/ath9k/main.c +1 -1
@@ -1358,9 +1358,9 @@ void ath_cleanup(struct ath_softc *sc)free_irq (sc->irq, sc);ath_bus_cleanup (common);kfree (sc->sec_wiphy); -ieee80211_free_hw (sc->hw);ath9k_uninit_hw (sc); +ieee80211_free_hw (sc->hw); } static int ath9k_reg_notifier(struct wiphy *wiphy,
drivers/net/wireless/p54/p54pci.c +1 -1
@@ -245,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
@@ -624,7 +624,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);
@@ -661,10 +661,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
@@ -470,12 +470,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
@@ -1029,6 +1029,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) {
@@ -1043,7 +1045,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/scsi_debug.c +2 -1
@@ -956,7 +956,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
@@ -1039,6 +1039,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
@@ -1255,9 +1255,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;
@@ -1789,6 +1788,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;
@@ -1808,6 +1835,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/core/message.c +1 -1
@@ -1471,7 +1471,7 @@ int usb_reset_configuration(struct usb_device *dev)/* If not, reinstate the old alternate settings */ if (retval <0 ) { reset_old_alts: -for (; i >=0 ; i--) { +for (i--; i >=0 ; i--) {struct usb_interface *intf = config->interface[i];struct usb_host_interface *alt;
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
@@ -2137,13 +2137,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; }
@@ -2209,9 +2223,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;
@@ -2219,6 +2234,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); + } }/*-------------------------------------------------------------------------*/
@@ -2245,7 +2267,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;
@@ -2408,7 +2430,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
@@ -229,6 +229,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
@@ -3767,7 +3767,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 */
@@ -3781,8 +3780,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
@@ -160,10 +160,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));
@@ -1425,10 +1425,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
@@ -4083,6 +4083,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
@@ -2910,7 +2910,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
@@ -557,7 +557,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 , };
@@ -976,21 +976,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)
@@ -1004,8 +996,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
@@ -1160,6 +1160,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);
@@ -1523,6 +1524,8 @@ xfs_fs_fill_super(if (error) goto fail_vnrele; +xfs_inode_shrinker_register (mp); +kfree (mtpt);return 0 ;
@@ -1767,6 +1770,7 @@ init_xfs_fs(void) goto out_cleanup_procfs;vfs_initquota (); +xfs_inode_shrinker_init (); error =register_filesystem (&xfs_fs_type);if (error)
@@ -1794,6 +1798,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
@@ -891,7 +891,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
@@ -229,6 +229,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
@@ -257,6 +257,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/ata.h +2 -2
@@ -1024,8 +1024,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 +9 -0
@@ -48,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/net/sctp/command.h +1 -0
@@ -107,6 +107,7 @@ typedef enum {SCTP_CMD_T1_RETRAN ,/* Mark for retransmission after T1 timeout */ SCTP_CMD_UPDATE_INITTAG ,/* Update peer inittag */ SCTP_CMD_SEND_MSG ,/* Send the whole use message */ +SCTP_CMD_SEND_NEXT_ASCONF ,/* Send the next ASCONF after ACK */ SCTP_CMD_LAST } sctp_verb_t;
include/net/sctp/sctp.h +1 -0
@@ -128,6 +128,7 @@ extern int sctp_register_pf(struct sctp_pf *, sa_family_t);int sctp_backlog_rcv (struct sock *sk,struct sk_buff *skb);int sctp_inet_listen (struct socket *sock,int backlog);void sctp_write_space (struct sock *sk); +void sctp_data_ready (struct sock *sk,int len);unsigned int sctp_poll (struct file *file,struct socket *sock,poll_table *wait);void sctp_sock_rfree (struct sk_buff *skb);
init/initramfs.c +2 -1
@@ -457,7 +457,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
@@ -4811,7 +4811,7 @@ err_fput_free_put_context: err_free_put_context:if (err <0 ) -kfree (event); +free_event (event); err_put_context:if (err <0 )
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
@@ -546,6 +546,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);
@@ -2447,8 +2448,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
@@ -2215,12 +2215,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/ieee802154/af_ieee802154.c +3 -0
@@ -147,6 +147,9 @@ static int ieee802154_dev_ioctl(struct sock *sk, struct ifreq __user *arg,dev_load (sock_net (sk), ifr.ifr_name); dev =dev_get_by_name (sock_net (sk), ifr.ifr_name); +if (!dev) +return -ENODEV ; +if (dev->type ==ARPHRD_IEEE802154 && dev->netdev_ops->ndo_do_ioctl) ret = dev->netdev_ops->ndo_do_ioctl (dev, &ifr, cmd);
net/ipv4/tcp.c +1 -0
@@ -1368,6 +1368,7 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,sk_eat_skb (sk, skb,0 );if (!desc->count)break ; + tp->copied_seq = seq; } tp->copied_seq = seq;
net/ipv4/udp.c +2 -2
@@ -471,8 +471,8 @@ static struct sock *__udp4_lib_lookup(struct net *net, __be32 saddr,if (hslot->count < hslot2->count) goto begin; - result =udp4_lib_lookup2 (net,INADDR_ANY , sport, - daddr, hnum, dif, + result =udp4_lib_lookup2 (net, saddr, sport, +INADDR_ANY , hnum, dif, hslot2, slot2); }rcu_read_unlock ();
net/ipv6/tcp_ipv6.c +1 -1
@@ -1006,7 +1006,7 @@ static void tcp_v6_send_response(struct sk_buff *skb, u32 seq, u32 ack, u32 win,skb_reserve (buff,MAX_HEADER +sizeof (struct ipv6hdr ) + tot_len); t1 = (struct tcphdr *)skb_push (buff, tot_len); -skb_reset_transport_header (skb); +skb_reset_transport_header (buff);/* Swap the send and the receive. */ memset (t1,0 ,sizeof (*t1));
net/ipv6/udp.c +2 -2
@@ -258,8 +258,8 @@ static struct sock *__udp6_lib_lookup(struct net *net,if (hslot->count < hslot2->count) goto begin; - result =udp6_lib_lookup2 (net, &in6addr_any, sport, - daddr, hnum, dif, + result =udp6_lib_lookup2 (net, saddr, sport, + &in6addr_any, hnum, dif, hslot2, slot2); }rcu_read_unlock ();
net/mac80211/agg-tx.c +0 -1
@@ -183,7 +183,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",
net/sctp/associola.c +4 -2
@@ -1194,8 +1194,10 @@ void sctp_assoc_update(struct sctp_association *asoc,/* Remove any peer addresses not present in the new association. */ list_for_each_safe (pos, temp, &asoc->peer.transport_addr_list) { trans = list_entry(pos, struct sctp_transport, transports); -if (!sctp_assoc_lookup_paddr (new, &trans->ipaddr)) -sctp_assoc_del_peer (asoc, &trans->ipaddr); +if (!sctp_assoc_lookup_paddr (new, &trans->ipaddr)) { +sctp_assoc_rm_peer (asoc, trans); +continue ; + }if (asoc->state >=SCTP_STATE_ESTABLISHED )sctp_transport_reset (trans);
net/sctp/endpointola.c +1 -0
@@ -144,6 +144,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep,/* Use SCTP specific send buffer space queues. */ ep->sndbuf_policy = sctp_sndbuf_policy; + sk->sk_data_ready = sctp_data_ready; sk->sk_write_space = sctp_write_space;sock_set_flag (sk,SOCK_USE_WRITE_QUEUE );
net/sctp/sm_make_chunk.c +10 -22
@@ -207,7 +207,8 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc, sp =sctp_sk (asoc->base.sk); num_types = sp->pf->supported_addrs (sp, types); - chunksize =sizeof (init) + addrs_len +SCTP_SAT_LEN (num_types); + chunksize =sizeof (init) + addrs_len; + chunksize +=WORD_ROUND (SCTP_SAT_LEN (num_types)); chunksize +=sizeof (ecap_param);if (sctp_prsctp_enable)
@@ -237,14 +238,14 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc,/* Add HMACS parameter length if any were defined */ auth_hmacs = (sctp_paramhdr_t *)asoc->c.auth_hmacs;if (auth_hmacs->length) - chunksize +=ntohs (auth_hmacs->length); + chunksize +=WORD_ROUND (ntohs (auth_hmacs->length));else auth_hmacs =NULL ;/* Add CHUNKS parameter length */ auth_chunks = (sctp_paramhdr_t *)asoc->c.auth_chunks;if (auth_chunks->length) - chunksize +=ntohs (auth_chunks->length); + chunksize +=WORD_ROUND (ntohs (auth_chunks->length));else auth_chunks =NULL ;
@@ -254,7 +255,8 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc,/* If we have any extensions to report, account for that */ if (num_ext) - chunksize +=sizeof (sctp_supported_ext_param_t) + num_ext; + chunksize +=WORD_ROUND (sizeof (sctp_supported_ext_param_t) + + num_ext);/* RFC 2960 3.3.2 Initiation (INIT) (1) *
@@ -396,13 +398,13 @@ struct sctp_chunk *sctp_make_init_ack(const struct sctp_association *asoc, auth_hmacs = (sctp_paramhdr_t *)asoc->c.auth_hmacs;if (auth_hmacs->length) - chunksize +=ntohs (auth_hmacs->length); + chunksize +=WORD_ROUND (ntohs (auth_hmacs->length));else auth_hmacs =NULL ; auth_chunks = (sctp_paramhdr_t *)asoc->c.auth_chunks;if (auth_chunks->length) - chunksize +=ntohs (auth_chunks->length); + chunksize +=WORD_ROUND (ntohs (auth_chunks->length));else auth_chunks =NULL ;
@@ -411,7 +413,8 @@ struct sctp_chunk *sctp_make_init_ack(const struct sctp_association *asoc, }if (num_ext) - chunksize +=sizeof (sctp_supported_ext_param_t) + num_ext; + chunksize +=WORD_ROUND (sizeof (sctp_supported_ext_param_t) + + num_ext);/* Now allocate and fill out the chunk. */ retval =sctp_make_chunk (asoc,SCTP_CID_INIT_ACK ,0 , chunksize);
@@ -3314,21 +3317,6 @@ int sctp_process_asconf_ack(struct sctp_association *asoc,sctp_chunk_free (asconf); asoc->addip_last_asconf =NULL ; -/* Send the next asconf chunk from the addip chunk queue. */ -if (!list_empty (&asoc->addip_chunk_list)) { -struct list_head *entry = asoc->addip_chunk_list.next; - asconf = list_entry(entry, struct sctp_chunk, list); - -list_del_init (entry); - -/* Hold the chunk until an ASCONF_ACK is received. */ -sctp_chunk_hold (asconf); -if (sctp_primitive_ASCONF (asoc, asconf)) -sctp_chunk_free (asconf); -else - asoc->addip_last_asconf = asconf; - } -return retval; }
net/sctp/sm_sideeffect.c +26 -0
@@ -961,6 +961,29 @@ static int sctp_cmd_send_msg(struct sctp_association *asoc, } +/* Sent the next ASCONF packet currently stored in the association. +* This happens after the ASCONF_ACK was succeffully processed. +*/ +static void sctp_cmd_send_asconf (struct sctp_association *asoc) +{ +/* Send the next asconf chunk from the addip chunk +* queue. +*/ +if (!list_empty (&asoc->addip_chunk_list)) { +struct list_head *entry = asoc->addip_chunk_list.next; +struct sctp_chunk *asconf =list_entry (entry, + struct sctp_chunk, list); +list_del_init (entry); + +/* Hold the chunk until an ASCONF_ACK is received. */ +sctp_chunk_hold (asconf); +if (sctp_primitive_ASCONF (asoc, asconf)) +sctp_chunk_free (asconf); +else + asoc->addip_last_asconf = asconf; + } +} +/* These three macros allow us to pull the debugging code out of the * main flow of sctp_do_sm() to keep attention focused on the real
@@ -1616,6 +1639,9 @@ static int sctp_cmd_interpreter(sctp_event_t event_type, } error =sctp_cmd_send_msg (asoc, cmd->obj.msg);break ; +case SCTP_CMD_SEND_NEXT_ASCONF : +sctp_cmd_send_asconf (asoc); +break ;default :printk (KERN_WARNING "Impossible command: %u, %p\n" , cmd->verb, cmd->obj.ptr);
net/sctp/sm_statefuns.c +7 -1
@@ -3675,8 +3675,14 @@ sctp_disposition_t sctp_sf_do_asconf_ack(const struct sctp_endpoint *ep, SCTP_TO(SCTP_EVENT_TIMEOUT_T4_RTO));if (!sctp_process_asconf_ack ((struct sctp_association *)asoc, - asconf_ack)) + asconf_ack)) { +/* Successfully processed ASCONF_ACK. We can +* release the next asconf if we have one. +*/ +sctp_add_cmd_sf (commands,SCTP_CMD_SEND_NEXT_ASCONF , +SCTP_NULL ());return SCTP_DISPOSITION_CONSUME ; + } abort =sctp_make_abort (asoc, asconf_ack,sizeof (sctp_errhdr_t));
net/sctp/socket.c +12 -2
@@ -3718,12 +3718,12 @@ SCTP_STATIC int sctp_init_sock(struct sock *sk) sp->hmac =NULL ;SCTP_DBG_OBJCNT_INC (sock); -percpu_counter_inc (&sctp_sockets_allocated);/* Set socket backlog limit. */ sk->sk_backlog.limit = sysctl_sctp_rmem[1 ];local_bh_disable (); +percpu_counter_inc (&sctp_sockets_allocated);sock_prot_inuse_add (sock_net (sk), sk->sk_prot,1 );local_bh_enable ();
@@ -3740,8 +3740,8 @@ SCTP_STATIC void sctp_destroy_sock(struct sock *sk)/* Release our hold on the endpoint. */ ep =sctp_sk (sk)->ep;sctp_endpoint_free (ep); -percpu_counter_dec (&sctp_sockets_allocated);local_bh_disable (); +percpu_counter_dec (&sctp_sockets_allocated);sock_prot_inuse_add (sock_net (sk), sk->sk_prot,-1 );local_bh_enable (); }
@@ -6188,6 +6188,16 @@ do_nonblock: goto out; } +void sctp_data_ready (struct sock *sk,int len) +{ +read_lock_bh (&sk->sk_callback_lock); +if (sk_has_sleeper (sk)) +wake_up_interruptible_sync_poll (sk->sk_sleep,POLLIN | +POLLRDNORM |POLLRDBAND ); +sk_wake_async (sk,SOCK_WAKE_WAITD ,POLL_IN ); +read_unlock_bh (&sk->sk_callback_lock); +} +/* If socket sndbuf has changed, wake up all per association waiters. */ void sctp_write_space (struct sock *sk) {
net/tipc/bearer.c +6 -31
@@ -45,10 +45,10 @@#define MAX_ADDR_STR 32 -static struct media *media_list =NULL ; +static struct media media_list[MAX_MEDIA ];static u32 media_count =0 ; -struct bearer *tipc_bearers =NULL ; +struct bearer tipc_bearers[MAX_BEARERS ];/** * media_name_valid - validate media name
@@ -108,9 +108,11 @@ int tipc_register_media(u32 media_type,int res = -EINVAL ;write_lock_bh (&tipc_net_lock); -if (!media_list) - goto exit; +if (tipc_mode !=TIPC_NET_MODE ) { +warn ("Media <%s> rejected, not in networked mode yet\n" , name); + goto exit; + }if (!media_name_valid (name)) {warn ("Media <%s> rejected, illegal name\n" , name); goto exit;
@@ -660,33 +662,10 @@ int tipc_disable_bearer(const char *name) -int tipc_bearer_init (void ) -{ -int res; - -write_lock_bh (&tipc_net_lock); - tipc_bearers =kcalloc (MAX_BEARERS ,sizeof (struct bearer ),GFP_ATOMIC ); - media_list =kcalloc (MAX_MEDIA ,sizeof (struct media ),GFP_ATOMIC ); -if (tipc_bearers && media_list) { - res =0 ; - }else { -kfree (tipc_bearers); -kfree (media_list); - tipc_bearers =NULL ; - media_list =NULL ; - res = -ENOMEM ; - } -write_unlock_bh (&tipc_net_lock); -return res; -} -void tipc_bearer_stop (void ) {u32 i; -if (!tipc_bearers) -return ;
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.