Linux 3.3.8
Greg KH
maintainerI'm announcing the release of the 3.3.8 kernel.
Note, this is the LAST 3.3.y kernel release, it is now end-of-life. Please move to the 3.4.y kernel tree as soon as possible.
All users of the 3.3 kernel series must upgrade.
The updated 3.3.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.3.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/HOWTO | 32 - Makefile | 11 arch/arm/include/asm/cacheflush.h | 2 arch/arm/kernel/traps.c | 4 arch/parisc/include/asm/prefetch.h | 7 arch/parisc/kernel/entry.S | 4 arch/parisc/kernel/pacache.S | 38 - arch/powerpc/kernel/idle.c | 14 arch/s390/mm/fault.c | 14 arch/sparc/Kconfig | 3 arch/sparc/kernel/systbls_64.S | 2 arch/tile/Kconfig | 1 arch/tile/include/asm/bitops.h | 12 arch/um/include/asm/pgtable.h | 10 arch/x86/Makefile | 4 arch/x86/boot/compressed/Makefile | 9 arch/x86/boot/compressed/relocs.c | 680 ----------------------- arch/x86/kernel/cpu/mcheck/mce-severity.c | 16 arch/x86/kernel/cpu/mcheck/mce.c | 8 arch/x86/kernel/cpu/perf_event_amd.c | 11 arch/x86/pci/xen.c | 4 arch/x86/tools/.gitignore | 1 arch/x86/tools/Makefile | 4 arch/x86/tools/relocs.c | 818 ++++++++++++++++++++++++++++ block/genhd.c | 10 drivers/ata/ahci.c | 2 drivers/ata/libata-transport.c | 1 drivers/gpio/gpio-mpc8xxx.c | 3 drivers/gpu/drm/gma500/psb_device.c | 6 drivers/gpu/drm/i915/i915_irq.c | 9 drivers/gpu/drm/i915/i915_reg.h | 15 drivers/gpu/drm/i915/intel_display.c | 19 drivers/gpu/drm/nouveau/nouveau_bo.c | 2 drivers/hid/hid-logitech-dj.c | 5 drivers/hid/hid-wiimote-core.c | 16 drivers/hid/usbhid/hid-core.c | 61 +- drivers/i2c/busses/i2c-davinci.c | 2 drivers/i2c/busses/i2c-tegra.c | 13 drivers/infiniband/core/umem.c | 2 drivers/infiniband/hw/cxgb4/cm.c | 13 drivers/iommu/dmar.c | 4 drivers/iommu/intel-iommu.c | 17 drivers/isdn/gigaset/capi.c | 22 drivers/md/md.c | 2 drivers/md/raid0.c | 18 drivers/media/dvb/siano/smsusb.c | 2 drivers/media/video/uvc/uvc_v4l2.c | 2 drivers/mmc/core/cd-gpio.c | 3 drivers/mmc/core/sdio.c | 2 drivers/mmc/core/sdio_irq.c | 11 drivers/mmc/host/omap_hsmmc.c | 2 drivers/mtd/sm_ftl.c | 2 drivers/net/wireless/b43legacy/main.c | 2 drivers/net/wireless/rtlwifi/pci.c | 17 drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 6 drivers/net/wireless/rtlwifi/usb.c | 12 drivers/regulator/core.c | 2 drivers/rtc/rtc-pl031.c | 18 drivers/scsi/hpsa.c | 34 - drivers/scsi/isci/init.c | 2 drivers/scsi/mpt2sas/mpt2sas_base.c | 6 drivers/spi/spi-fsl-spi.c | 6 drivers/staging/comedi/comedi_fops.c | 2 drivers/tty/serial/8250/8250_pci.c | 18 drivers/tty/serial/mxs-auart.c | 2 drivers/tty/serial/serial_core.c | 1 drivers/usb/class/cdc-wdm.c | 4 drivers/usb/core/devio.c | 33 - drivers/usb/core/hub.c | 4 drivers/usb/core/quirks.c | 3 drivers/usb/core/urb.c | 21 drivers/usb/gadget/fsl_udc_core.c | 2 drivers/usb/host/ehci-pci.c | 4 drivers/usb/host/ohci-at91.c | 11 drivers/usb/host/pci-quirks.c | 32 + drivers/usb/host/xhci-mem.c | 27 drivers/usb/host/xhci-pci.c | 1 drivers/usb/host/xhci-ring.c | 21 drivers/usb/host/xhci.h | 1 drivers/usb/misc/usbtest.c | 17 drivers/usb/serial/ftdi_sio.c | 1 drivers/usb/serial/ftdi_sio_ids.h | 8 drivers/usb/serial/ti_usb_3410_5052.c | 6 drivers/usb/serial/ti_usb_3410_5052.h | 1 drivers/usb/storage/unusual_devs.h | 7 drivers/video/udlfb.c | 146 ++-- drivers/xen/events.c | 5 fs/aio.c | 30 - fs/bio.c | 7 fs/block_dev.c | 6 fs/buffer.c | 4 include/linux/fs.h | 1 include/linux/genhd.h | 6 include/linux/mmc/host.h | 2 include/linux/usb.h | 3 include/video/udlfb.h | 1 include/xen/events.h | 3 init/main.c | 7 kernel/workqueue.c | 9 mm/mempolicy.c | 41 - mm/swapfile.c | 2 net/wireless/reg.c | 10 scripts/Makefile | 2 security/selinux/selinuxfs.c | 1 tools/usb/ffs-test.c | 2 105 files changed, 1565 insertions(+), 1030 deletions(-)
Alan Cox (2):
tty: Allow uart_register/unregister/register
gma500: Fix Poulsbo suspend/resume crash on devices with SDVO ports
Alan Stern (1):
usb-storage: unusual_devs entry for Yarvik PMP400 MP4 player
Andi Kleen (1):
MCE: Fix vm86 handling for 32bit mce handler
Andiry Xu (1):
usbcore: enable USB2 LPM if port suspend fails
Arnaud Patard (1):
8250_pci: fix pch uart matching
Ben Widawsky (1):
drm/i915: [GEN7] Use HW scheduler for fixed function shaders
Bernd Schubert (1):
bio allocation failure due to bio_get_nr_vecs()
Bernie Thompson (1):
udlfb: fix hcd_buffer_free panic on unplug/replug
Bjørn Mork (1):
USB: cdc-wdm: poll must return POLLHUP if device is gone
Chris Metcalf (2):
tilegx: enable SYSCALL_WRAPPERS support
tile: fix bug where fls(0) was not returning 0
Chris Wilson (1):
drm/i915: Avoid a double-read of PCH_IIR during interrupt handling
Dan Carpenter (1):
iommu: Fix off by one in dmar_get_fault_reason()
Dan Williams (1):
isci: fix oem parameter validation on single controller skus
Daniel Vetter (1):
drm/i915: don't clobber the pipe param in sanitize_modesetting
Darren Hart (1):
USB: serial: ti_usb_3410_5052: Add support for the FRI2 serial console
Dave Airlie (1):
nouveau: nouveau_set_bo_placement takes TTM flags
David Herrmann (1):
HID: wiimote: Fix IR data parser
David Howells (1):
KEYS: Use the compat keyctl() syscall wrapper on Sparc64 for Sparc32 compat
David Woodhouse (1):
intel-iommu: Add device info into list before doing context mapping
Dima Zavin (2):
ARM: 7365/1: drop unused parameter from flush_cache_user_range
ARM: 7409/1: Do not call flush_cache_user_range with mmap_sem held
Eric Paris (1):
SELinux: if sel_make_bools errors don't leave inconsistent state
Greg Kroah-Hartman (1):
Linux 3.3.8
Guennadi Liakhovetski (1):
mmc: cd-gpio: protect against NULL context in mmc_cd_gpio_free()
H. Peter Anvin (5):
x86, realmode: 16-bit real-mode code support for relocs tool x86, relocs: Workaround for binutils 2.22.52.0.1 section bug x86, relocs: When printing an error, say relative or absolute x86-32, relocs: Whitelist more symbols for ld bug workaround x86, relocs: Add jiffies and jiffies_64 to the relative whitelist
Hans de Goede (1):
usb-xhci: Handle COMP_TX_ERR for isoc tds
Heiko Carstens (1):
s390/pfault: fix task state race
Herton Ronaldo Krzesinski (1):
spi/spi-fsl-spi: reference correct pdata in fsl_spi_cs_control
Huajun Li (1):
USB: Remove races in devio.c
James Bottomley (2):
PARISC: fix PA1.1 oops on boot
PARISC: fix panic on prefetch(NULL) on PA7300LC
Jarkko Sakkinen (1):
x86, relocs: Build clean fix
Jeff Moyer (1):
block: don't mark buffers beyond end of disk as mapped
Jes Sorensen (1):
md: Avoid OOPS when reshaping raid1 to raid0
John David Anglin (1):
PARISC: fix crash in flush_icache_page_asm on PA1.1
Jonathan Nieder (1):
HID: logitech: read all 32 bits of report type bitfield
Julia Lawall (1):
drivers/staging/comedi/comedi_fops.c: add missing vfree
Kees Cook (1):
docs: update HOWTO for 2.6.x -> 3.x versioning
Kenth Eriksson (1):
spi/mpc83xx: fix NULL pdata dereference bug
Larry Finger (3):
b43legacy: Fix error due to MMIO access with SSB unpowered
rtlwifi: fix for race condition when firmware is cached
rtlwifi: rtl8192de: Fix firmware initialization
Laurent Pinchart (1):
media: uvcvideo: Fix ENUMINPUT handling
Laxman Dewangan (1):
i2c: tegra: notify transfer-complete after clearing status.
Lin Ming (1):
libata: forbid port runtime pm by default, fixing regression
Linus Torvalds (2):
vfs: make AIO use the proper rw_verify_area() area helpers Fix blocking allocations called very early during bootup
Lothar Waßmann (1):
Add missing call to uart_update_timeout()
Luis R. Rodriguez (1):
cfg80211: warn if db.txt is empty with CONFIG_CFG80211_INTERNAL_REGDB
Marcus Folkesson (1):
i2c: davinci: Free requested IRQ in remove
Mark Brown (1):
regulator: core: Release regulator-regulator supplies on error
Matt Johnson (1):
ahci: Detect Marvell 88SE9172 SATA controller
Matthias Fend (1):
USB: ffs-test: fix length argument of out function call
Maxim Levitsky (1):
mtd: sm_ftl: fix typo in major number.
Mel Gorman (1):
mm: mempolicy: Let vma_merge and vma_split handle vma->vm_policy linkages
Michael Krufky (1):
smsusb: add autodetection support for USB ID 2040:c0a0
Ming Lei (1):
mmc: omap_hsmmc: pass IRQF_ONESHOT to request_threaded_irq
Nicolas Ferre (1):
USB: ohci-at91: add a reset function to fix race condition
Nicolas Pitre (1):
mmc: sdio: avoid spurious calls to interrupt handlers
Oliver Neukum (3):
usbhid: prevent deadlock during timeout
USB: cdc-wdm: sanitize error returns
USB: fix resource leak in xhci power loss path
Paul Zimmerman (1):
usb: usbtest: two super speed fixes for usbtest
Peter Chen (1):
usb: gadget: fsl_udc_core: dTD's next dtd pointer need to be updated once written
Rajkumar Kasirajan (1):
drivers/rtc/rtc-pl031.c: configure correct wday for 2000-01-01
Richard Weinberger (2):
um: Fix __swp_type()
um: Implement a custom pte_same() function
Robert Richter (1):
perf/x86: Update event scheduling constraints for AMD family 15h models
Sarah Sharp (4):
xhci: Add Lynx Point to list of Intel switchable hosts.
xhci: Avoid dead ports when CONFIG_USB_XHCI_HCD=n
xhci: Reset reserved command ring TRBs on cleanup.
xhci: Add new short TX quirk for Fresco Logic host.
Shaohua Li (2):
swap: don't do discard if no discard option added
md: using GFP_NOIO to allocate bio for flush request
Stefano Stabellini (1):
xen: do not map the same GSI twice in PVHVM guests.
Steffen Müller (1):
usb: add USB_QUIRK_RESET_RESUME for M-Audio 88es
Stephen M. Cameron (1):
SCSI: hpsa: Fix problem with MSA2xxx devices
Steve Wise (3):
RDMA/cxgb4: Always wake up waiters in c4iw_peer_abort_intr() RDMA/cxgb4: Use dst parameter in import_ep() RDMA/cxgb4: Drop peer_abort when no endpoint found
Tejun Heo (2):
block: fix buffer overflow when printing partition UUIDs
workqueue: skip nr_running sanity check in worker_enter_idle() if trustee is active
Thomas Gleixner (2):
powerpc: Fix broken cpu_idle_wait() implementation
gpio: mpc8xxx: Prevent NULL pointer deref in demux handler
Tilman Schmidt (1):
isdn/gigaset: ratelimit CAPI message dumps
Tony Luck (1):
x86/mce: Fix check for processor context when machine check was taken.
Yishai Hadas (1):
IB/core: Fix mismatch between locked and pinned pages
[email protected] (1):
SCSI: mpt2sas: Fix for panic happening because of improper memory allocation
Éric Piel (1):
USB: ftdi-sio: add support for Physik Instrumente E-861
Greg KH
maintainerDocumentation/HOWTO +16 -16
@@ -218,16 +218,16 @@ The development process Linux kernel development process currently consists of a few different main kernel "branches" and lots of different subsystem-specific kernel branches. These different branches are: - - main 2.6.x kernel tree - - 2.6.x.y -stable kernel tree - - 2.6.x -git kernel patches + - main 3.x kernel tree + - 3.x.y -stable kernel tree + - 3.x -git kernel patches - subsystem specific kernel trees and patches - - the 2.6.x -next kernel tree for integration tests + - the 3.x -next kernel tree for integration tests -2.6.x kernel tree +3.x kernel tree ----------------- -2.6.x kernels are maintained by Linus Torvalds, and can be found on -kernel.org in the pub/linux/kernel/v2.6/ directory. Its development +3.x kernels are maintained by Linus Torvalds, and can be found on +kernel.org in the pub/linux/kernel/v3.x/ directory. Its development process is as follows: - As soon as a new kernel is released a two weeks window is open, during this period of time maintainers can submit big diffs to
@@ -262,20 +262,20 @@ mailing list about kernel releases: released according to perceived bug status, not according to a preconceived timeline." -2.6.x.y -stable kernel tree +3.x.y -stable kernel tree --------------------------- -Kernels with 4-part versions are -stable kernels. They contain +Kernels with 3-part versions are -stable kernels. They contain relatively small and critical fixes for security problems or significant -regressions discovered in a given 2.6.x kernel. +regressions discovered in a given 3.x kernel. This is the recommended branch for users who want the most recent stable kernel and are not interested in helping test development/experimental versions. -If no 2.6.x.y kernel is available, then the highest numbered 2.6.x +If no 3.x.y kernel is available, then the highest numbered 3.x kernel is the current stable kernel. -2.6.x.y are maintained by the "stable" team <[email protected]>, and +3.x.y are maintained by the "stable" team <[email protected]>, and are released as needs dictate. The normal release period is approximately two weeks, but it can be longer if there are no pressing problems. A security-related problem, instead, can cause a release to happen almost
@@ -285,7 +285,7 @@ The file Documentation/stable_kernel_rules.txt in the kernel tree documents what kinds of changes are acceptable for the -stable tree, and how the release process works. -2.6.x -git patches +3.x -git patches ------------------ These are daily snapshots of Linus' kernel tree which are managed in a git repository (hence the name.) These patches are usually released
@@ -317,13 +317,13 @@ revisions to it, and maintainers can mark patches as under review, accepted, or rejected. Most of these patchwork sites are listed at http://patchwork.kernel.org/. -2.6.x -next kernel tree for integration tests +3.x -next kernel tree for integration tests --------------------------------------------- -Before updates from subsystem trees are merged into the mainline 2.6.x +Before updates from subsystem trees are merged into the mainline 3.x tree, they need to be integration-tested. For this purpose, a special testing repository exists into which virtually all subsystem trees are pulled on an almost daily basis: - http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git + http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git http://linux.f-seidel.de/linux-next/pmwiki/ This way, the -next kernel gives a summary outlook onto what will be
Makefile +7 -4
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 3 -SUBLEVEL = 7 +SUBLEVEL = 8 EXTRAVERSION = NAME = Saber-toothed Squirrel
@@ -442,7 +442,7 @@ asm-generic: no-dot-config-targets := clean mrproper distclean \ cscope gtags TAGS tags help %docs check% coccicheck \ - include/linux/version.h headers_% archheaders \ + include/linux/version.h headers_% archheaders archscripts \ kernelversion %src-pkg config-targets := 0
@@ -979,7 +979,7 @@ prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \ include/config/auto.conf $(cmd_crmodverdir) -archprepare: archheaders prepare1 scripts_basic +archprepare: archheaders archscripts prepare1 scripts_basic prepare0: archprepare FORCE $(Q)$(MAKE) $(build)=.
@@ -1049,8 +1049,11 @@ hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) PHONY += archheaders archheaders: +PHONY += archscripts +archscripts: + PHONY += __headers -__headers: include/linux/version.h scripts_basic asm-generic archheaders FORCE +__headers: include/linux/version.h scripts_basic asm-generic archheaders archscripts FORCE $(Q)$(MAKE) $(build)=scripts build_unifdef PHONY += headers_install_all
arch/arm/include/asm/cacheflush.h +1 -1
@@ -249,7 +249,7 @@ extern void flush_cache_page(struct vm_area_struct *vma, unsigned long user_addr* Harvard caches are synchronised for the user space address range. * This is used for the ARM private sys_cacheflush system call. */ -#define flush_cache_user_range (vma,start,end) \ +#define flush_cache_user_range (start,end) \ __cpuc_coherent_user_range((start) & PAGE_MASK, PAGE_ALIGN(end))/*
arch/arm/kernel/traps.c +3 -1
@@ -491,7 +491,9 @@ do_cache_op(unsigned long start, unsigned long end, int flags)if (end > vma->vm_end) end = vma->vm_end; -flush_cache_user_range (vma, start, end); +up_read (&mm->mmap_sem); +flush_cache_user_range (start, end); +return ; }up_read (&mm->mmap_sem); }
arch/parisc/include/asm/prefetch.h +6 -1
@@ -21,7 +21,12 @@#define ARCH_HAS_PREFETCH static inline void prefetch (const void *addr) { - __asm__("ldw 0(%0), %%r0" : :"r" (addr)); + __asm__( +#ifndef CONFIG_PA20 + /* Need to avoid prefetch of NULL on PA7300LC */ + " extrw,u,= %0,31,32,%%r0\n" +#endif +" ldw 0(%0), %%r0" : :"r" (addr)); }/* LDD is a PA2.0 addition. */
arch/parisc/kernel/entry.S +4 -0
@@ -581,7 +581,11 @@ */ cmpiclr,= 0x01,\tmp,%r0 ldi (_PAGE_DIRTY|_PAGE_READ|_PAGE_WRITE),\prot +#ifdef CONFIG_64BIT depd,z \prot,8,7,\prot +#else + depw,z \prot,8,7,\prot +#endif /* * OK, it is in the temp alias region, check whether "from" or "to". * Check "subtle" note in pacache.S re: r23/r26.
arch/parisc/kernel/pacache.S +20 -18
@@ -692,7 +692,7 @@ ENTRY(flush_icache_page_asm) /* Purge any old translation */ - pitlb (%sr0,%r28) + pitlb (%sr4,%r28) ldil L%icache_stride, %r1 ldw R%icache_stride(%r1), %r1
@@ -706,27 +706,29 @@ ENTRY(flush_icache_page_asm) sub %r25, %r1, %r25 -1: fic,m %r1(%r28) - fic,m %r1(%r28) - fic,m %r1(%r28) - fic,m %r1(%r28) - fic,m %r1(%r28) - fic,m %r1(%r28) - fic,m %r1(%r28) - fic,m %r1(%r28) - fic,m %r1(%r28) - fic,m %r1(%r28) - fic,m %r1(%r28) - fic,m %r1(%r28) - fic,m %r1(%r28) - fic,m %r1(%r28) - fic,m %r1(%r28) + /* fic only has the type 26 form on PA1.1, requiring an + * explicit space specification, so use %sr4 */ +1: fic,m %r1(%sr4,%r28) + fic,m %r1(%sr4,%r28) + fic,m %r1(%sr4,%r28) + fic,m %r1(%sr4,%r28) + fic,m %r1(%sr4,%r28) + fic,m %r1(%sr4,%r28) + fic,m %r1(%sr4,%r28) + fic,m %r1(%sr4,%r28) + fic,m %r1(%sr4,%r28) + fic,m %r1(%sr4,%r28) + fic,m %r1(%sr4,%r28) + fic,m %r1(%sr4,%r28) + fic,m %r1(%sr4,%r28) + fic,m %r1(%sr4,%r28) + fic,m %r1(%sr4,%r28) cmpb,COND(<<) %r28, %r25,1b - fic,m %r1(%r28) + fic,m %r1(%sr4,%r28) sync bv %r0(%r2) - pitlb (%sr0,%r25) + pitlb (%sr4,%r25) .exit .procend
arch/powerpc/kernel/idle.c +5 -9
@@ -109,6 +109,9 @@ void cpu_idle(void) } } +static void do_nothing (void *unused) +{ +}/* * cpu_idle_wait - Used to ensure that all the CPUs come out of the old
@@ -119,16 +122,9 @@ void cpu_idle(void)*/ void cpu_idle_wait (void ) { -int cpu;smp_mb (); - -/* kick all the CPUs so that they exit out of old idle routine */ -get_online_cpus (); -for_each_online_cpu (cpu) { -if (cpu !=smp_processor_id ()) -smp_send_reschedule (cpu); - } -put_online_cpus (); +/* kick all the CPUs so that they exit out of pm_idle */ +smp_call_function (do_nothing,NULL ,1 ); }EXPORT_SYMBOL_GPL (cpu_idle_wait);
arch/s390/mm/fault.c +12 -2
@@ -574,6 +574,7 @@ static void pfault_interrupt(unsigned int ext_int_code, tsk->thread.pfault_wait =0 ;list_del (&tsk->thread.list);wake_up_process (tsk); +put_task_struct (tsk); }else {/* Completion interrupt was faster than initial * interrupt. Set pfault_wait to -1 so the initial
@@ -588,14 +589,22 @@ static void pfault_interrupt(unsigned int ext_int_code,put_task_struct (tsk); }else {/* signal bit not set -> a real page is missing. */ -if (tsk->thread.pfault_wait ==-1 ) { +if (tsk->thread.pfault_wait ==1 ) { +/* Already on the list with a reference: put to sleep */ +set_task_state (tsk,TASK_UNINTERRUPTIBLE ); +set_tsk_need_resched (tsk); + }else if (tsk->thread.pfault_wait ==-1 ) {/* Completion interrupt was faster than the initial * interrupt (pfault_wait == -1). Set pfault_wait * back to zero and exit. */ tsk->thread.pfault_wait =0 ; }else {/* Initial interrupt arrived before completion -* interrupt. Let the task sleep. */ +* interrupt. Let the task sleep. +* An extra task reference is needed since a different +* cpu may set the task state to TASK_RUNNING again +* before the scheduler is reached. */ +get_task_struct (tsk); tsk->thread.pfault_wait =1 ;list_add (&tsk->thread.list, &pfault_list);set_task_state (tsk,TASK_UNINTERRUPTIBLE );
@@ -620,6 +629,7 @@ static int __cpuinit pfault_cpu_notify(struct notifier_block *self,list_del (&thread->list); tsk = container_of(thread, struct task_struct, thread);wake_up_process (tsk); +put_task_struct (tsk); }spin_unlock_irq (&pfault_lock);break ;
arch/sparc/Kconfig +3 -0
@@ -582,6 +582,9 @@ config SYSVIPC_COMPAT depends on COMPAT && SYSVIPC default y +config KEYS_COMPAT + def_bool y if COMPAT && KEYS + endmenu source "net/Kconfig"
arch/sparc/kernel/systbls_64.S +1 -1
@@ -74,7 +74,7 @@ sys_call_table32: .word sys_timer_delete, compat_sys_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy /*270*/ .word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink .word compat_sys_mq_timedsend, compat_sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid -/*280*/ .word sys32_tee, sys_add_key, sys_request_key, sys_keyctl, compat_sys_openat +/*280*/ .word sys32_tee, sys_add_key, sys_request_key, compat_sys_keyctl, compat_sys_openat .word sys_mkdirat, sys_mknodat, sys_fchownat, compat_sys_futimesat, compat_sys_fstatat64 /*290*/ .word sys_unlinkat, sys_renameat, sys_linkat, sys_symlinkat, sys_readlinkat .word sys_fchmodat, sys_faccessat, compat_sys_pselect6, compat_sys_ppoll, sys_unshare
arch/tile/Kconfig +1 -0
@@ -11,6 +11,7 @@ config TILE select GENERIC_IRQ_PROBE select GENERIC_PENDING_IRQ if SMP select GENERIC_IRQ_SHOW + select HAVE_SYSCALL_WRAPPERS if TILEGX select SYS_HYPERVISOR select ARCH_HAVE_NMI_SAFE_CMPXCHG if !M386
arch/tile/include/asm/bitops.h +6 -6
@@ -77,6 +77,11 @@ static inline int ffs(int x)return __builtin_ffs (x); } +static inline int fls64 (__u64 w) +{ +return (sizeof (__u64) *8 ) -__builtin_clzll (w); +} +/** * fls - find last set bit in word * @x: the word to search
@@ -90,12 +95,7 @@ static inline int ffs(int x)*/ static inline int fls (int x) { -return (sizeof (int ) *8 ) -__builtin_clz (x); -} - -static inline int fls64 (__u64 w) -{ -return (sizeof (__u64) *8 ) -__builtin_clzll (w); +return fls64 ((unsigned int ) x); }static inline unsigned int __arch_hweight32 (unsigned int w)
arch/um/include/asm/pgtable.h +8 -2
@@ -271,6 +271,12 @@ static inline void set_pte(pte_t *pteptr, pte_t pteval) }#define set_pte_at (mm,addr,ptep,pteval) set_pte(ptep,pteval) +#define __HAVE_ARCH_PTE_SAME +static inline int pte_same (pte_t pte_a,pte_t pte_b) +{ +return !((pte_val (pte_a) ^pte_val (pte_b)) & ~_PAGE_NEWPAGE); +} +/* * Conversion functions: convert a page and protection to a page entry, * and a page entry and page directory to the page they refer to.
@@ -346,11 +352,11 @@ extern pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr);#define update_mmu_cache (vma,address,ptep) do ; while (0)/* Encode and de-code a swap entry */ -#define __swp_type (x) (((x).val >> 4) & 0x3f) +#define __swp_type (x) (((x).val >> 5) & 0x1f)#define __swp_offset (x) ((x).val >> 11)#define __swp_entry (type, offset) \ - ((swp_entry_t) { ((type) << 4) | ((offset) << 11) }) + ((swp_entry_t) { ((type) << 5) | ((offset) << 11) })#define __pte_to_swp_entry (pte) \ ((swp_entry_t) { pte_val(pte_mkuptodate(pte)) })#define __swp_entry_to_pte (x) ((pte_t) { (x).val })
arch/x86/Makefile +4 -0
@@ -117,6 +117,9 @@ KBUILD_CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,) KBUILD_CFLAGS += $(mflags-y) KBUILD_AFLAGS += $(mflags-y) +archscripts: + $(Q)$(MAKE) $(build)=arch/x86/tools relocs + ### # Syscall table generation
@@ -186,6 +189,7 @@ archclean: $(Q)rm -rf $(objtree)/arch/i386 $(Q)rm -rf $(objtree)/arch/x86_64 $(Q)$(MAKE) $(clean)=$(boot) + $(Q)$(MAKE) $(clean)=arch/x86/tools define archhelp echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)'
arch/x86/boot/compressed/Makefile +4 -5
@@ -40,13 +40,12 @@ OBJCOPYFLAGS_vmlinux.bin := -R .comment -S $(obj)/vmlinux.bin: vmlinux FORCE $(call if_changed,objcopy) +targets += vmlinux.bin.all vmlinux.relocs -targets += vmlinux.bin.all vmlinux.relocs relocs -hostprogs-$(CONFIG_X86_NEED_RELOCS) += relocs - +CMD_RELOCS = arch/x86/tools/relocs quiet_cmd_relocs = RELOCS $@ - cmd_relocs = $(obj)/relocs $< > $@;$(obj)/relocs --abs-relocs $< -$(obj)/vmlinux.relocs: vmlinux $(obj)/relocs FORCE + cmd_relocs = $(CMD_RELOCS) $< > $@;$(CMD_RELOCS) --abs-relocs $< +$(obj)/vmlinux.relocs: vmlinux FORCE $(call if_changed,relocs) vmlinux.bin.all-y := $(obj)/vmlinux.bin
arch/x86/boot/compressed/relocs.c deleted +0 -680
680 lines not on this page · raw message
arch/x86/kernel/cpu/mcheck/mce-severity.c +10 -6
@@ -145,15 +145,19 @@ static struct severity { };/* -* If the EIPV bit is set, it means the saved IP is the -* instruction which caused the MCE. +* If mcgstatus indicated that ip/cs on the stack were +* no good, then "m->cs" will be zero and we will have +* to assume the worst case (IN_KERNEL) as we actually +* have no idea what we were executing when the machine +* check hit. +* If we do have a good "m->cs" (or a faked one in the +* case we were executing in VM86 mode) we can use it to +* distinguish an exception taken in user from from one +* taken in the kernel. */ static int error_context (struct mce *m) { -if (m->mcgstatus &MCG_STATUS_EIPV ) -return (m->ip && (m->cs &3 ) ==3 ) ?IN_USER :IN_KERNEL ; -/* Unknown, assume kernel */ -return IN_KERNEL ; +return ((m->cs &3 ) ==3 ) ?IN_USER :IN_KERNEL ; }int mce_severity (struct mce *m,int tolerant,char **msg)
arch/x86/kernel/cpu/mcheck/mce.c +8 -0
@@ -437,6 +437,14 @@ static inline void mce_gather_info(struct mce *m, struct pt_regs *regs)if (m->mcgstatus & (MCG_STATUS_RIPV |MCG_STATUS_EIPV )) { m->ip = regs->ip; m->cs = regs->cs; + +/* +* When in VM86 mode make the cs look like ring 3 +* always. This is a lie, but it's better than passing +* the additional vm86 bit around everywhere. +*/ +if (v8086_mode (regs)) + m->cs |=3 ; }/* Use accurate RIP reporting if available. */ if (rip_msr)
arch/x86/kernel/cpu/perf_event_amd.c +10 -1
@@ -473,6 +473,7 @@ static __initconst const struct x86_pmu amd_pmu = {* 0x023 DE PERF_CTL[2:0] * 0x02D LS PERF_CTL[3] * 0x02E LS PERF_CTL[3,0] +* 0x031 LS PERF_CTL[2:0] (**) * 0x043 CU PERF_CTL[2:0] * 0x045 CU PERF_CTL[2:0] * 0x046 CU PERF_CTL[2:0]
@@ -486,10 +487,12 @@ static __initconst const struct x86_pmu amd_pmu = {* 0x0DD LS PERF_CTL[5:0] * 0x0DE LS PERF_CTL[5:0] * 0x0DF LS PERF_CTL[5:0] +* 0x1C0 EX PERF_CTL[5:3] * 0x1D6 EX PERF_CTL[5:0] * 0x1D8 EX PERF_CTL[5:0] * -* (*) depending on the umask all FPU counters may be used +* (*) depending on the umask all FPU counters may be used +* (**) only one unitmask enabled at a time */ static struct event_constraint amd_f15_PMC0 =EVENT_CONSTRAINT (0 ,0x01 ,0 );
@@ -539,6 +542,12 @@ amd_get_event_constraints_f15h(struct cpu_hw_events *cpuc, struct perf_event *evreturn &amd_f15_PMC3;case 0x02E :return &amd_f15_PMC30; +case 0x031 : +if (hweight_long (hwc->config &ARCH_PERFMON_EVENTSEL_UMASK ) <=1 ) +return &amd_f15_PMC20; +return &emptyconstraint; +case 0x1C0 : +return &amd_f15_PMC53;default :return &amd_f15_PMC50; }
arch/x86/pci/xen.c +4 -0
@@ -64,6 +64,10 @@ static int xen_register_pirq(u32 gsi, int gsi_override, int triggering,int shareable =0 ;char *name; + irq =xen_irq_from_gsi (gsi); +if (irq >0 ) +return irq; +if (set_pirq) pirq = gsi;
arch/x86/tools/.gitignore new file +1 -0
@@ -0,0 +1 @@ +relocs
arch/x86/tools/Makefile +4 -0
@@ -36,3 +36,7 @@ HOSTCFLAGS_insn_sanity.o := -Wall -I$(objtree)/arch/x86/lib/ -I$(srctree)/arch/x $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/inat.c $(srctree)/arch/x86/include/asm/inat_types.h $(srctree)/arch/x86/include/asm/inat.h $(srctree)/arch/x86/include/asm/insn.h $(objtree)/arch/x86/lib/inat-tables.c $(obj)/insn_sanity.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/inat.c $(srctree)/arch/x86/include/asm/inat_types.h $(srctree)/arch/x86/include/asm/inat.h $(srctree)/arch/x86/include/asm/insn.h $(objtree)/arch/x86/lib/inat-tables.c + +HOST_EXTRACFLAGS += -I$(srctree)/tools/include +hostprogs-y += relocs +relocs: $(obj)/relocs
arch/x86/tools/relocs.c new file +818 -0
818 lines not on this page · raw message
block/genhd.c +6 -4
@@ -743,7 +743,7 @@ void __init printk_all_partitions(void)struct hd_struct *part;char name_buf[BDEVNAME_SIZE ];char devt_buf[BDEVT_SIZE ]; -u8 uuid[PARTITION_META_INFO_UUIDLTH *2 +1 ]; +char uuid_buf[PARTITION_META_INFO_UUIDLTH *2 +5 ];/* * Don't show empty devices or things that have been
@@ -762,14 +762,16 @@ void __init printk_all_partitions(void)while ((part =disk_part_iter_next (&piter))) {bool is_part0 = part == &disk->part0; - uuid[0 ] =0 ; + uuid_buf[0 ] ='\0' ;if (part->info) -part_unpack_uuid (part->info->uuid, uuid); +snprintf (uuid_buf,sizeof (uuid_buf),"%pU" , + part->info->uuid);printk ("%s%s %10llu %s %s" , is_part0 ?"" :" " ,bdevt_str (part_devt (part), devt_buf), (unsigned long long )part->nr_sects >>1 , -disk_name (disk, part->partno, name_buf), uuid); +disk_name (disk, part->partno, name_buf), + uuid_buf);if (is_part0) {if (disk->driverfs_dev !=NULL && disk->driverfs_dev->driver !=NULL )
drivers/ata/ahci.c +2 -0
@@ -386,6 +386,8 @@ static const struct pci_device_id ahci_pci_tbl[] = { .driver_data = board_ahci_yes_fbs }, /* 88se9128 */ { PCI_DEVICE(0x1b4b, 0x9125), .driver_data = board_ahci_yes_fbs }, /* 88se9125 */ + { PCI_DEVICE(0x1b4b, 0x917a), + .driver_data = board_ahci_yes_fbs }, /* 88se9172 */ { PCI_DEVICE(0x1b4b, 0x91a3), .driver_data = board_ahci_yes_fbs },
drivers/ata/libata-transport.c +1 -0
@@ -294,6 +294,7 @@ int ata_tport_add(struct device *parent,device_enable_async_suspend (dev);pm_runtime_set_active (dev);pm_runtime_enable (dev); +pm_runtime_forbid (dev);transport_add_device (dev);transport_configure_device (dev);
drivers/gpio/gpio-mpc8xxx.c +2 -1
@@ -163,7 +163,8 @@ static void mpc8xxx_gpio_irq_cascade(unsigned int irq, struct irq_desc *desc)if (mask)generic_handle_irq (irq_linear_revmap (mpc8xxx_gc->irq,32 -ffs (mask))); - chip->irq_eoi (&desc->irq_data); +if (chip->irq_eoi) + chip->irq_eoi (&desc->irq_data); }static void mpc8xxx_irq_unmask (struct irq_data *d)
drivers/gpu/drm/gma500/psb_device.c +4 -2
@@ -196,7 +196,8 @@ static int psb_save_display_registers(struct drm_device *dev) }list_for_each_entry (connector, &dev->mode_config.connector_list, head) - connector->funcs->save (connector); +if (connector->funcs->save) + connector->funcs->save (connector);mutex_unlock (&dev->mode_config.mutex);return 0 ;
@@ -233,7 +234,8 @@ static int psb_restore_display_registers(struct drm_device *dev) crtc->funcs->restore (crtc);list_for_each_entry (connector, &dev->mode_config.connector_list, head) - connector->funcs->restore (connector); +if (connector->funcs->restore) + connector->funcs->restore (connector);mutex_unlock (&dev->mode_config.mutex);return 0 ;
drivers/gpu/drm/i915/i915_irq.c +3 -6
@@ -424,14 +424,11 @@ static void gen6_pm_rps_work(struct work_struct *work)mutex_unlock (&dev_priv->dev->struct_mutex); } -static void pch_irq_handler (struct drm_device *dev) +static void pch_irq_handler (struct drm_device *dev,u32 pch_iir) {drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; -u32 pch_iir;int pipe; - pch_iir =I915_READ (SDEIIR ); -if (pch_iir &SDE_AUDIO_POWER_MASK ) DRM_DEBUG_DRIVER("PCH audio power change on port %d\n", (pch_iir & SDE_AUDIO_POWER_MASK) >>
@@ -529,7 +526,7 @@ static irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS)if (de_iir &DE_PCH_EVENT_IVB ) {if (pch_iir &SDE_HOTPLUG_MASK_CPT )queue_work (dev_priv->wq, &dev_priv->hotplug_work); -pch_irq_handler (dev); +pch_irq_handler (dev, pch_iir); }if (pm_iir &GEN6_PM_DEFERRED_EVENTS ) {
@@ -629,7 +626,7 @@ static irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS)if (de_iir &DE_PCH_EVENT ) {if (pch_iir & hotplug_mask)queue_work (dev_priv->wq, &dev_priv->hotplug_work); -pch_irq_handler (dev); +pch_irq_handler (dev, pch_iir); }if (de_iir &DE_PCU_EVENT ) {
drivers/gpu/drm/i915/i915_reg.h +15 -0
@@ -570,6 +570,21 @@#define GEN6_BSD_RNCID 0x12198 +#define GEN7_FF_THREAD_MODE 0x20a0 +#define GEN7_FF_SCHED_MASK 0x0077070 +#define GEN7_FF_TS_SCHED_HS1 (0x5<<16) +#define GEN7_FF_TS_SCHED_HS0 (0x3<<16) +#define GEN7_FF_TS_SCHED_LOAD_BALANCE (0x1<<16) +#define GEN7_FF_TS_SCHED_HW (0x0<<16)/* Default */ +#define GEN7_FF_VS_SCHED_HS1 (0x5<<12) +#define GEN7_FF_VS_SCHED_HS0 (0x3<<12) +#define GEN7_FF_VS_SCHED_LOAD_BALANCE (0x1<<12)/* Default */ +#define GEN7_FF_VS_SCHED_HW (0x0<<12) +#define GEN7_FF_DS_SCHED_HS1 (0x5<<4) +#define GEN7_FF_DS_SCHED_HS0 (0x3<<4) +#define GEN7_FF_DS_SCHED_LOAD_BALANCE (0x1<<4)/* Default */ +#define GEN7_FF_DS_SCHED_HW (0x0<<4) +/* * Framebuffer compression (915+ only) */
drivers/gpu/drm/i915/intel_display.c +17 -2
@@ -7496,10 +7496,11 @@ static void intel_sanitize_modesetting(struct drm_device *dev, {struct drm_i915_private *dev_priv = dev->dev_private;u32 reg, val; +int i;/* Clear any frame start delays used for debugging left by the BIOS */ -for_each_pipe (pipe) { - reg =PIPECONF (pipe); +for_each_pipe (i) { + reg =PIPECONF (i);I915_WRITE (reg,I915_READ (reg) & ~PIPECONF_FRAME_START_DELAY_MASK ); }
@@ -8467,6 +8468,18 @@ static void gen6_init_clock_gating(struct drm_device *dev) } } +static void gen7_setup_fixed_func_scheduler (struct drm_i915_private *dev_priv) +{ +uint32_t reg =I915_READ (GEN7_FF_THREAD_MODE ); + + reg &= ~GEN7_FF_SCHED_MASK ; + reg |=GEN7_FF_TS_SCHED_HW ; + reg |=GEN7_FF_VS_SCHED_HW ; + reg |=GEN7_FF_DS_SCHED_HW ; + +I915_WRITE (GEN7_FF_THREAD_MODE , reg); +} +static void ivybridge_init_clock_gating (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -8511,6 +8524,8 @@ static void ivybridge_init_clock_gating(struct drm_device *dev) DISPPLANE_TRICKLE_FEED_DISABLE);intel_flush_display_plane (dev_priv, pipe); } + +gen7_setup_fixed_func_scheduler (dev_priv); }static void g4x_init_clock_gating (struct drm_device *dev)
drivers/gpu/drm/nouveau/nouveau_bo.c +1 -1
@@ -1035,7 +1035,7 @@ nouveau_ttm_fault_reserve_notify(struct ttm_buffer_object *bo) nvbo->placement.fpfn =0 ; nvbo->placement.lpfn = dev_priv->fb_mappable_pages; -nouveau_bo_placement_set (nvbo,TTM_PL_VRAM ,0 ); +nouveau_bo_placement_set (nvbo,TTM_PL_FLAG_VRAM ,0 );return nouveau_bo_validate (nvbo, false, true, false); }
drivers/hid/hid-logitech-dj.c +3 -2
@@ -26,6 +26,7 @@#include <linux/hid.h> #include <linux/module.h> #include <linux/usb.h> +#include <asm/unaligned.h> #include "usbhid/usbhid.h" #include "hid-ids.h" #include "hid-logitech-dj.h"
@@ -265,8 +266,8 @@ static void logi_dj_recv_add_djhid_device(struct dj_receiver_dev *djrcv_dev, goto dj_device_allocate_fail; } - dj_dev->reports_supported =le32_to_cpu ( - dj_report->report_params[DEVICE_PAIRED_RF_REPORT_TYPE ]); + dj_dev->reports_supported =get_unaligned_le32 ( + dj_report->report_params +DEVICE_PAIRED_RF_REPORT_TYPE ); dj_dev->hdev = dj_hiddev; dj_dev->dj_receiver_dev = djrcv_dev; dj_dev->device_index = dj_report->device_index;
drivers/hid/hid-wiimote-core.c +5 -11
@@ -769,7 +769,7 @@ static void __ir_to_input(struct wiimote_data *wdata, const __u8 *ir,/* * Basic IR data is encoded into 3 bytes. The first two bytes are the -* upper 8 bit of the X/Y data, the 3rd byte contains the lower 2 bits +* lower 8 bit of the X/Y data, the 3rd byte contains the upper 2 bits * of both. * If data is packed, then the 3rd byte is put first and slightly * reordered. This allows to interleave packed and non-packed data to
@@ -778,17 +778,11 @@ static void __ir_to_input(struct wiimote_data *wdata, const __u8 *ir,*/ if (packed) { - x = ir[1 ] <<2 ; - y = ir[2 ] <<2 ; - - x |= ir[0 ] &0x3 ; - y |= (ir[0 ] >>2 ) &0x3 ; + x = ir[1 ] | ((ir[0 ] &0x03 ) <<8 ); + y = ir[2 ] | ((ir[0 ] &0x0c ) <<6 ); }else { - x = ir[0 ] <<2 ; - y = ir[1 ] <<2 ; - - x |= (ir[2 ] >>4 ) &0x3 ; - y |= (ir[2 ] >>6 ) &0x3 ; + x = ir[0 ] | ((ir[2 ] &0x30 ) <<4 ); + y = ir[1 ] | ((ir[2 ] &0xc0 ) <<2 ); }input_report_abs (wdata->ir, xid, x);
drivers/hid/usbhid/hid-core.c +55 -6
103 lines not on this page · raw message
drivers/i2c/busses/i2c-davinci.c +1 -1
@@ -755,7 +755,7 @@ static int davinci_i2c_remove(struct platform_device *pdev) dev->clk =NULL ;davinci_i2c_write_reg (dev,DAVINCI_I2C_MDR_REG ,0 ); -free_irq (IRQ_I2C , dev); +free_irq (dev->irq, dev);iounmap (dev->base);kfree (dev);
drivers/i2c/busses/i2c-tegra.c +6 -7
@@ -401,8 +401,6 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id)disable_irq_nosync (i2c_dev->irq); i2c_dev->irq_disabled =1 ; } - -complete (&i2c_dev->msg_complete); goto err; }
@@ -411,7 +409,6 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id) i2c_dev->msg_err |=I2C_ERR_NO_ACK ;if (status &I2C_INT_ARBITRATION_LOST ) i2c_dev->msg_err |=I2C_ERR_ARBITRATION_LOST ; -complete (&i2c_dev->msg_complete); goto err; }
@@ -429,14 +426,14 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id)tegra_i2c_mask_irq (i2c_dev,I2C_INT_TX_FIFO_DATA_REQ ); } +i2c_writel (i2c_dev, status,I2C_INT_STATUS ); +if (i2c_dev->is_dvc) +dvc_writel (i2c_dev,DVC_STATUS_I2C_DONE_INTR ,DVC_STATUS ); +if (status &I2C_INT_PACKET_XFER_COMPLETE ) {BUG_ON (i2c_dev->msg_buf_remaining);complete (&i2c_dev->msg_complete); } - -i2c_writel (i2c_dev, status,I2C_INT_STATUS ); -if (i2c_dev->is_dvc) -dvc_writel (i2c_dev,DVC_STATUS_I2C_DONE_INTR ,DVC_STATUS );return IRQ_HANDLED ; err:/* An error occurred, mask all interrupts */
@@ -446,6 +443,8 @@ err:i2c_writel (i2c_dev, status,I2C_INT_STATUS );if (i2c_dev->is_dvc)dvc_writel (i2c_dev,DVC_STATUS_I2C_DONE_INTR ,DVC_STATUS ); + +complete (&i2c_dev->msg_complete);return IRQ_HANDLED ; }
drivers/infiniband/core/umem.c +1 -1
@@ -269,7 +269,7 @@ void ib_umem_release(struct ib_umem *umem) }else down_write (&mm->mmap_sem); - current->mm->locked_vm -= diff; + current->mm->pinned_vm -= diff;up_write (&mm->mmap_sem);mmput (mm);kfree (umem);
drivers/infiniband/hw/cxgb4/cm.c +8 -5
@@ -1593,7 +1593,7 @@ static int import_ep(struct c4iw_ep *ep, __be32 peer_ip, struct dst_entry *dst, n, n->dev, 0);if (!ep->l2t) goto out; - ep->mtu =dst_mtu (ep->dst); + ep->mtu =dst_mtu (dst); ep->tx_chan =cxgb4_port_chan (n->dev); ep->smac_idx = (cxgb4_port_viid (n->dev) &0x7F ) <<1 ; step = cdev->rdev.lldi.ntxq /
@@ -2654,6 +2654,12 @@ static int peer_abort_intr(struct c4iw_dev *dev, struct sk_buff *skb)unsigned int tid =GET_TID (req); ep =lookup_tid (t, tid); +if (!ep) { + printk(KERN_WARNING MOD + "Abort on non-existent endpoint, tid %d\n", tid); +kfree_skb (skb); +return 0 ; + }if (is_neg_adv_abort (req->status)) {PDBG ("%s neg_adv_abort ep %p tid %u\n" , __func__, ep, ep->hwtid);
@@ -2665,11 +2671,8 @@ static int peer_abort_intr(struct c4iw_dev *dev, struct sk_buff *skb)/* * Wake up any threads in rdma_init() or rdma_fini(). -* However, this is not needed if com state is just -* MPA_REQ_SENT */ -if (ep->com.state !=MPA_REQ_SENT ) -c4iw_wake_up (&ep->com.wr_wait, -ECONNRESET ); +c4iw_wake_up (&ep->com.wr_wait, -ECONNRESET );sched (dev, skb);return 0 ; }
drivers/iommu/dmar.c +2 -2
@@ -1056,8 +1056,8 @@ static const char *intr_remap_fault_reasons[] =const char *dmar_get_fault_reason (u8 fault_reason,int *fault_type) { -if (fault_reason >=0x20 && (fault_reason <=0x20 + -ARRAY_SIZE (intr_remap_fault_reasons))) { +if (fault_reason >=0x20 && (fault_reason -0x20 < +ARRAY_SIZE (intr_remap_fault_reasons))) { *fault_type =INTR_REMAP ;return intr_remap_fault_reasons[fault_reason -0x20 ]; }else if (fault_reason <ARRAY_SIZE (dma_remap_fault_reasons)) {
drivers/iommu/intel-iommu.c +11 -6
@@ -2280,12 +2280,6 @@ static int domain_add_dev_info(struct dmar_domain *domain,if (!info)return -ENOMEM ; - ret =domain_context_mapping (domain, pdev, translation); -if (ret) { -free_devinfo_mem (info); -return ret; - } - info->segment =pci_domain_nr (pdev->bus); info->bus = pdev->bus->number; info->devfn = pdev->devfn;
@@ -2298,6 +2292,17 @@ static int domain_add_dev_info(struct dmar_domain *domain, pdev->dev.archdata.iommu = info;spin_unlock_irqrestore (&device_domain_lock, flags); + ret =domain_context_mapping (domain, pdev, translation); +if (ret) { +spin_lock_irqsave (&device_domain_lock, flags); +list_del (&info->link); +list_del (&info->global); + pdev->dev.archdata.iommu =NULL ; +spin_unlock_irqrestore (&device_domain_lock, flags); +free_devinfo_mem (info); +return ret; + } +return 0 ; }
drivers/isdn/gigaset/capi.c +9 -13
@@ -14,6 +14,7 @@#include "gigaset.h" #include <linux/proc_fs.h> #include <linux/seq_file.h> +#include <linux/ratelimit.h> #include <linux/isdn/capilli.h> #include <linux/isdn/capicmd.h> #include <linux/isdn/capiutil.h>
@@ -223,10 +224,14 @@ get_appl(struct gigaset_capi_ctr *iif, u16 appl)static inline void dump_cmsg (enum debuglevel level,const char *tag,_cmsg *p) {#ifdef CONFIG_GIGASET_DEBUG +/* dump at most 20 messages in 20 secs */ + static DEFINE_RATELIMIT_STATE(msg_dump_ratelimit, 20 * HZ, 20);_cdebbuf *cdb;if (!(gigaset_debuglevel & level))return ; +if (!___ratelimit (&msg_dump_ratelimit, tag)) +return ; cdb =capi_cmsg2str (p);if (cdb) {
@@ -2059,12 +2064,6 @@ static void do_reset_b3_req(struct gigaset_capi_ctr *iif, }/* -* dump unsupported/ignored messages at most twice per minute, -* some apps send those very frequently -*/ -static unsigned long ignored_msg_dump_time; - -/* * unsupported CAPI message handler */ static void do_unsupported(struct gigaset_capi_ctr *iif,
@@ -2073,8 +2072,7 @@ static void do_unsupported(struct gigaset_capi_ctr *iif, {/* decode message */ capi_message2cmsg (&iif->acmsg, skb->data); -if (printk_timed_ratelimit (&ignored_msg_dump_time,30 *1000 )) -dump_cmsg (DEBUG_CMD , __func__, &iif->acmsg); +dump_cmsg (DEBUG_CMD , __func__, &iif->acmsg);send_conf (iif, ap, skb, CapiMessageNotSupportedInCurrentState); }
@@ -2085,11 +2083,9 @@ static void do_nothing(struct gigaset_capi_ctr *iif,struct gigaset_capi_appl *ap, struct sk_buff *skb) { -if (printk_timed_ratelimit (&ignored_msg_dump_time,30 *1000 )) { -/* decode message */ -capi_message2cmsg (&iif->acmsg, skb->data); -dump_cmsg (DEBUG_CMD , __func__, &iif->acmsg); - } +/* decode message */ + capi_message2cmsg(&iif->acmsg, skb->data); +dump_cmsg (DEBUG_CMD , __func__, &iif->acmsg);dev_kfree_skb_any (skb); }
drivers/md/md.c +1 -1
@@ -452,7 +452,7 @@ static void submit_flushes(struct work_struct *ws)atomic_inc (&rdev->nr_pending);atomic_inc (&rdev->nr_pending);rcu_read_unlock (); - bi =bio_alloc_mddev (GFP_KERNEL ,0 , mddev); + bi =bio_alloc_mddev (GFP_NOIO ,0 , mddev); bi->bi_end_io = md_end_flush; bi->bi_private = rdev; bi->bi_bdev = rdev->bdev;
drivers/md/raid0.c +17 -1
@@ -609,6 +609,7 @@ static void *raid0_takeover_raid10(struct mddev *mddev)static void *raid0_takeover_raid1 (struct mddev *mddev) {struct r0conf *priv_conf; +int chunksect;/* Check layout: * - (N - 1) mirror drives must be already faulty
@@ -619,10 +620,25 @@ static void *raid0_takeover_raid1(struct mddev *mddev)return ERR_PTR (-EINVAL ); } +/* +* a raid1 doesn't have the notion of chunk size, so +* figure out the largest suitable size we can use. +*/ + chunksect =64 *2 ;/* 64K by default */ + +/* The array must be an exact multiple of chunksize */ +while (chunksect && (mddev->array_sectors & (chunksect -1 ))) + chunksect >>=1 ; + +if ((chunksect <<9 ) <PAGE_SIZE ) +/* array size does not allow a suitable chunk size */ +return ERR_PTR (-EINVAL ); +/* Set new parameters */ mddev->new_level =0 ; mddev->new_layout =0 ; - mddev->new_chunk_sectors =128 ;/* by default set chunk size to 64k */ + mddev->new_chunk_sectors = chunksect; + mddev->chunk_sectors = chunksect; mddev->delta_disks =1 - mddev->raid_disks; mddev->raid_disks =1 ;/* make sure it will be not marked as dirty */
drivers/media/dvb/siano/smsusb.c +2 -0
@@ -542,6 +542,8 @@ static const struct usb_device_id smsusb_id_table[] __devinitconst = { .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, { USB_DEVICE(0x2040, 0xc090), .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, + { USB_DEVICE(0x2040, 0xc0a0), + .driver_info = SMS1XXX_BOARD_HAUPPAUGE_WINDHAM }, { }/* Terminating entry */ };
drivers/media/video/uvc/uvc_v4l2.c +1 -1
@@ -686,7 +686,7 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)break ; } pin = iterm->id; - }else if (pin < selector->bNrInPins) { + }else if (index < selector->bNrInPins) { pin = selector->baSourceID[index];list_for_each_entry (iterm, &chain->entities, chain) {if (!UVC_ENTITY_IS_ITERM (iterm))
drivers/mmc/core/cd-gpio.c +3 -0
@@ -67,6 +67,9 @@ void mmc_cd_gpio_free(struct mmc_host *host) {struct mmc_cd_gpio *cd = host->hotplug.handler_priv; +if (!cd) +return ; +free_irq (host->hotplug.irq, host);gpio_free (cd->gpio);kfree (cd);
drivers/mmc/core/sdio.c +1 -1
@@ -947,7 +947,7 @@ static int mmc_sdio_resume(struct mmc_host *host) }if (!err && host->sdio_irqs) -mmc_signal_sdio_irq (host); +wake_up_process (host->sdio_irq_thread);mmc_release_host (host);/*
drivers/mmc/core/sdio_irq.c +7 -4
@@ -28,18 +28,20 @@#include "sdio_ops.h" -static int process_sdio_pending_irqs (struct mmc_card *card) +static int process_sdio_pending_irqs (struct mmc_host *host) { +struct mmc_card *card = host->card;int i, ret, count;unsigned char pending;struct sdio_func *func;/* * Optimization, if there is only 1 function interrupt registered -* call irq handler directly +* and we know an IRQ was signaled then call irq handler directly. +* Otherwise do the full probe. */ func = card->sdio_single_irq; -if (func) { +if (func && host->sdio_irq_pending) { func->irq_handler (func);return 1 ; }
@@ -116,7 +118,8 @@ static int sdio_irq_thread(void *_host) ret =__mmc_claim_host (host, &host->sdio_irq_thread_abort);if (ret)break ; - ret =process_sdio_pending_irqs (host->card); + ret =process_sdio_pending_irqs (host); + host->sdio_irq_pending = false;mmc_release_host (host);/*
drivers/mmc/host/omap_hsmmc.c +1 -1
@@ -2034,7 +2034,7 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) ret =request_threaded_irq (mmc_slot (host).card_detect_irq,NULL , omap_hsmmc_detect, -IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING , +IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING |IRQF_ONESHOT ,mmc_hostname (mmc), host);if (ret) { dev_dbg(mmc_dev(host->mmc),
drivers/mtd/sm_ftl.c +1 -1
@@ -1256,7 +1256,7 @@ static void sm_remove_dev(struct mtd_blktrans_dev *dev)static struct mtd_blktrans_ops sm_ftl_ops = { .name ="smblk" , - .major =-1 , + .major =0 , .part_bits =SM_FTL_PARTN_BITS , .blksize =SM_SECTOR_SIZE , .getgeo = sm_getgeo,
drivers/net/wireless/b43legacy/main.c +0 -2
@@ -1564,8 +1564,6 @@ static int b43legacy_request_firmware(struct b43legacy_wldev *dev)const char *filename;int err; -/* do dummy read */ -ssb_read32 (dev->dev,SSB_TMSHIGH );if (!fw->ucode) {if (rev ==2 ) filename ="ucode2" ;
drivers/net/wireless/rtlwifi/pci.c +9 -8
@@ -1865,14 +1865,6 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,/*like read eeprom and so on */ rtlpriv->cfg->ops->read_eeprom_info (hw); -if (rtlpriv->cfg->ops->init_sw_vars (hw)) { -RT_TRACE (rtlpriv,COMP_ERR ,DBG_EMERG , - ("Can't init_sw_vars.\n" )); - goto fail3; - } - - rtlpriv->cfg->ops->init_sw_leds (hw); -/*aspm */ rtl_pci_init_aspm (hw);
@@ -1892,6 +1884,15 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev, goto fail3; } +if (rtlpriv->cfg->ops->init_sw_vars (hw)) { +RT_TRACE (rtlpriv,COMP_ERR ,DBG_EMERG , + ("Can't init_sw_vars.\n" )); + err = -ENODEV ; + goto fail3; + } + + rtlpriv->cfg->ops->init_sw_leds (hw); + err =sysfs_create_group (&pdev->dev.kobj, &rtl_attribute_group);if (err) { RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
drivers/net/wireless/rtlwifi/rtl8192de/sw.c +0 -6
@@ -94,7 +94,6 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)u8 tid;struct rtl_priv *rtlpriv =rtl_priv (hw);struct rtl_pci *rtlpci =rtl_pcidev (rtl_pcipriv (hw)); -static int header_print; rtlpriv->dm.dm_initialgain_enable = true; rtlpriv->dm.dm_flag =0 ;
@@ -174,10 +173,6 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)for (tid =0 ; tid <8 ; tid++)skb_queue_head_init (&rtlpriv->mac80211.skb_waitq[tid]); -/* Only load firmware for first MAC */ -if (header_print) -return 0 ; -/* for firmware buf */ rtlpriv->rtlhal.pfirmware =vzalloc (0x8000 );if (!rtlpriv->rtlhal.pfirmware) {
@@ -189,7 +184,6 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw) rtlpriv->max_fw_size =0x8000 ;pr_info ("Driver for Realtek RTL8192DE WLAN interface\n" );pr_info ("Loading firmware file %s\n" , rtlpriv->cfg->fw_name); - header_print++;/* request fw */ err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name,
drivers/net/wireless/rtlwifi/usb.c +6 -6
@@ -970,12 +970,6 @@ int __devinit rtl_usb_probe(struct usb_interface *intf, rtlpriv->cfg->ops->read_chip_version (hw);/*like read eeprom and so on */ rtlpriv->cfg->ops->read_eeprom_info (hw); -if (rtlpriv->cfg->ops->init_sw_vars (hw)) { -RT_TRACE (rtlpriv,COMP_ERR ,DBG_EMERG , - ("Can't init_sw_vars.\n" )); - goto error_out; - } - rtlpriv->cfg->ops->init_sw_leds (hw); err =_rtl_usb_init (hw); err =_rtl_usb_init_sw (hw);/* Init mac80211 sw */
@@ -985,6 +979,12 @@ int __devinit rtl_usb_probe(struct usb_interface *intf, ("Can't allocate sw for mac80211.\n")); goto error_out; } +if (rtlpriv->cfg->ops->init_sw_vars (hw)) { +RT_TRACE (rtlpriv,COMP_ERR ,DBG_EMERG , + ("Can't init_sw_vars.\n" )); + goto error_out; + } + rtlpriv->cfg->ops->init_sw_leds (hw);return 0 ; error_out:
drivers/regulator/core.c +2 -0
@@ -2877,6 +2877,8 @@ unset_supplies:unset_regulator_supplies (rdev); scrub: +if (rdev->supply) +regulator_put (rdev->supply);kfree (rdev->constraints);device_unregister (&rdev->dev);/* device core frees rdev */
drivers/rtc/rtc-pl031.c +18 -0
@@ -312,6 +312,7 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id)int ret;struct pl031_local *ldata;struct rtc_class_ops *ops = id->data; +unsigned long time; ret =amba_request_regions (adev,NULL );if (ret)
@@ -343,6 +344,23 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id)writel (readl (ldata->base +RTC_CR ) |RTC_CR_CWEN , ldata->base +RTC_CR ); +/* +* On ST PL031 variants, the RTC reset value does not provide correct +* weekday for 2000-01-01. Correct the erroneous sunday to saturday. +*/ +if (ldata->hw_designer ==AMBA_VENDOR_ST ) { +if (readl (ldata->base +RTC_YDR ) ==0x2000 ) { + time =readl (ldata->base +RTC_DR ); +if ((time & + (RTC_MON_MASK |RTC_MDAY_MASK |RTC_WDAY_MASK )) + ==0x02120000 ) { + time = time | (0x7 <<RTC_WDAY_SHIFT ); +writel (0x2000 , ldata->base +RTC_YLR ); +writel (time, ldata->base +RTC_LR ); + } + } + } + ldata->rtc =rtc_device_register ("pl031" , &adev->dev, ops,THIS_MODULE );if (IS_ERR (ldata->rtc)) {
drivers/scsi/hpsa.c +15 -19
@@ -1676,30 +1676,26 @@ static void figure_bus_target_lun(struct ctlr_info *h,if (is_logical_dev_addr_mode (lunaddrbytes)) {/* logical device */ -if (unlikely (is_scsi_rev_5 (h))) { -/* p1210m, logical drives lun assignments -* match SCSI REPORT LUNS data. + lunid =le32_to_cpu (*((__le32 *) lunaddrbytes)); +if (is_msa2xxx (h, device)) { +/* msa2xxx way, put logicals on bus 1 +* and match target/lun numbers box +* reports. */ - lunid =le32_to_cpu (*((__le32 *) lunaddrbytes)); - *bus =0 ; - *target =0 ; - *lun = (lunid &0x3fff ) +1 ; + *bus =1 ; + *target = (lunid >>16 ) &0x3fff ; + *lun = lunid &0x00ff ; }else { -/* not p1210m... */ - lunid =le32_to_cpu (*((__le32 *) lunaddrbytes)); -if (is_msa2xxx (h, device)) { -/* msa2xxx way, put logicals on bus 1 -* and match target/lun numbers box -* reports. -*/ - *bus =1 ; - *target = (lunid >>16 ) &0x3fff ; - *lun = lunid &0x00ff ; +if (likely (is_scsi_rev_5 (h))) { +/* All current smart arrays (circa 2011) */ + *bus =0 ; + *target =0 ; + *lun = (lunid &0x3fff ) +1 ; }else { -/* Traditional smart array way. */ +/* Traditional old smart array way. */ *bus =0 ; - *lun =0 ; *target = lunid &0x3fff ; + *lun =0 ; } } }else {
drivers/scsi/isci/init.c +1 -1
@@ -481,7 +481,7 @@ static int __devinit isci_pci_probe(struct pci_dev *pdev, const struct pci_devicif (!orom) orom =isci_request_oprom (pdev); -for (i =0 ; orom && i <ARRAY_SIZE (orom->ctrl); i++) { +for (i =0 ; orom && i <num_controllers (pdev); i++) {if (sci_oem_parameters_validate (&orom->ctrl[i], orom->hdr.version)) { dev_warn(&pdev->dev,
drivers/scsi/mpt2sas/mpt2sas_base.c +3 -3
@@ -3340,7 +3340,7 @@ _base_get_port_facts(struct MPT2SAS_ADAPTER *ioc, int port, int sleep_flag) } pfacts = &ioc->pfacts[port]; -memset (pfacts,0 ,sizeof (Mpi2PortFactsReply_t)); +memset (pfacts,0 ,sizeof (struct mpt2sas_port_facts )); pfacts->PortNumber = mpi_reply.PortNumber; pfacts->VP_ID = mpi_reply.VP_ID; pfacts->VF_ID = mpi_reply.VF_ID;
@@ -3382,7 +3382,7 @@ _base_get_ioc_facts(struct MPT2SAS_ADAPTER *ioc, int sleep_flag) } facts = &ioc->facts; -memset (facts,0 ,sizeof (Mpi2IOCFactsReply_t)); +memset (facts,0 ,sizeof (struct mpt2sas_facts )); facts->MsgVersion =le16_to_cpu (mpi_reply.MsgVersion); facts->HeaderVersion =le16_to_cpu (mpi_reply.HeaderVersion); facts->VP_ID = mpi_reply.VP_ID;
@@ -4259,7 +4259,7 @@ mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc) goto out_free_resources; ioc->pfacts =kcalloc (ioc->facts.NumberOfPorts, -sizeof (Mpi2PortFactsReply_t),GFP_KERNEL ); +sizeof (struct mpt2sas_port_facts ),GFP_KERNEL );if (!ioc->pfacts) { r = -ENOMEM ; goto out_free_resources;
drivers/spi/spi-fsl-spi.c +4 -2
@@ -139,10 +139,12 @@ static void fsl_spi_change_mode(struct spi_device *spi)static void fsl_spi_chipselect (struct spi_device *spi,int value) {struct mpc8xxx_spi *mpc8xxx_spi =spi_master_get_devdata (spi->master); -struct fsl_spi_platform_data *pdata = spi->dev.parent->platform_data; +struct fsl_spi_platform_data *pdata;bool pol = spi->mode &SPI_CS_HIGH ;struct spi_mpc8xxx_cs *cs = spi->controller_state; + pdata = spi->dev.parent->parent->platform_data; +if (value ==BITBANG_CS_INACTIVE ) {if (pdata->cs_control) pdata->cs_control (spi, !pol);
@@ -931,7 +933,7 @@ err:static void fsl_spi_cs_control (struct spi_device *spi,bool on) { -struct device *dev = spi->dev.parent; +struct device *dev = spi->dev.parent->parent;struct mpc8xxx_spi_probe_info *pinfo =to_of_pinfo (dev->platform_data);u16 cs = spi->chip_select;int gpio = pinfo->gpios[cs];
drivers/staging/comedi/comedi_fops.c +1 -1
@@ -280,7 +280,7 @@ static int do_devconfig_ioctl(struct comedi_device *dev,if (ret ==0 ) {if (!try_module_get (dev->driver->module)) {comedi_device_detach (dev); -return -ENOSYS ; + ret = -ENOSYS ; } }
drivers/tty/serial/8250/8250_pci.c +18 -0
@@ -1609,54 +1609,72 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = { { .vendor = PCI_VENDOR_ID_INTEL, .device = 0x8811, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, .init = pci_eg20t_init, .setup = pci_default_setup, }, { .vendor = PCI_VENDOR_ID_INTEL, .device = 0x8812, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, .init = pci_eg20t_init, .setup = pci_default_setup, }, { .vendor = PCI_VENDOR_ID_INTEL, .device = 0x8813, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, .init = pci_eg20t_init, .setup = pci_default_setup, }, { .vendor = PCI_VENDOR_ID_INTEL, .device = 0x8814, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, .init = pci_eg20t_init, .setup = pci_default_setup, }, { .vendor = 0x10DB, .device = 0x8027, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, .init = pci_eg20t_init, .setup = pci_default_setup, }, { .vendor = 0x10DB, .device = 0x8028, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, .init = pci_eg20t_init, .setup = pci_default_setup, }, { .vendor = 0x10DB, .device = 0x8029, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, .init = pci_eg20t_init, .setup = pci_default_setup, }, { .vendor = 0x10DB, .device = 0x800C, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, .init = pci_eg20t_init, .setup = pci_default_setup, }, { .vendor = 0x10DB, .device = 0x800D, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, .init = pci_eg20t_init, .setup = pci_default_setup, },
drivers/tty/serial/mxs-auart.c +2 -0
@@ -369,6 +369,8 @@ static void mxs_auart_settermios(struct uart_port *u,writel (ctrl, u->membase +AUART_LINECTRL );writel (ctrl2, u->membase +AUART_CTRL2 ); + +uart_update_timeout (u, termios->c_cflag, baud); }static irqreturn_t mxs_auart_irq_handle (int irq,void *context)
drivers/tty/serial/serial_core.c +1 -0
@@ -2283,6 +2283,7 @@ void uart_unregister_driver(struct uart_driver *drv)tty_unregister_driver (p);put_tty_driver (p);kfree (drv->state); + drv->state =NULL ; drv->tty_driver =NULL ; }
drivers/usb/class/cdc-wdm.c +2 -2
@@ -500,7 +500,7 @@ static int wdm_flush(struct file *file, fl_owner_t id)dev_err (&desc->intf->dev,"Error in flush path: %d\n" , desc->werr); -return desc->werr; +return usb_translate_errors (desc->werr); }static unsigned int wdm_poll (struct file *file,struct poll_table_struct *wait)
@@ -511,7 +511,7 @@ static unsigned int wdm_poll(struct file *file, struct poll_table_struct *wait)spin_lock_irqsave (&desc->iuspin, flags);if (test_bit (WDM_DISCONNECTING , &desc->flags)) { - mask =POLLERR ; + mask =POLLHUP |POLLERR ;spin_unlock_irqrestore (&desc->iuspin, flags); goto desc_out; }
drivers/usb/core/devio.c +25 -8
@@ -333,17 +333,14 @@ static struct async *async_getcompleted(struct dev_state *ps)static struct async *async_getpending (struct dev_state *ps,void __user *userurb) { -unsigned long flags;struct async *as; -spin_lock_irqsave (&ps->lock, flags);list_for_each_entry (as, &ps->async_pending, asynclist)if (as->userurb == userurb) {list_del_init (&as->asynclist); -spin_unlock_irqrestore (&ps->lock, flags);return as; } -spin_unlock_irqrestore (&ps->lock, flags); +return NULL ; }
@@ -398,6 +395,7 @@ static void cancel_bulk_urbs(struct dev_state *ps, unsigned bulk_addr) __releases(ps->lock) __acquires(ps->lock) { +struct urb *urb;struct async *as;/* Mark all the pending URBs that match bulk_addr, up to but not
@@ -420,8 +418,11 @@ __acquires(ps->lock)list_for_each_entry (as, &ps->async_pending, asynclist) {if (as->bulk_status ==AS_UNLINK ) { as->bulk_status =0 ;/* Only once */ + urb = as->urb; +usb_get_urb (urb);spin_unlock (&ps->lock);/* Allow completions */ -usb_unlink_urb (as->urb); +usb_unlink_urb (urb); +usb_put_urb (urb);spin_lock (&ps->lock); goto rescan; }
@@ -472,6 +473,7 @@ static void async_completed(struct urb *urb)static void destroy_async (struct dev_state *ps,struct list_head *list) { +struct urb *urb;struct async *as;unsigned long flags;
@@ -479,10 +481,13 @@ static void destroy_async(struct dev_state *ps, struct list_head *list)while (!list_empty (list)) { as = list_entry(list->next, struct async, asynclist);list_del_init (&as->asynclist); + urb = as->urb; +usb_get_urb (urb);/* drop the spinlock so the completion handler can run */ spin_unlock_irqrestore (&ps->lock, flags); -usb_kill_urb (as->urb); +usb_kill_urb (urb); +usb_put_urb (urb);spin_lock_irqsave (&ps->lock, flags); }spin_unlock_irqrestore (&ps->lock, flags);
@@ -1410,12 +1415,24 @@ static int proc_submiturb(struct dev_state *ps, void __user *arg)static int proc_unlinkurb (struct dev_state *ps,void __user *arg) { +struct urb *urb;struct async *as; +unsigned long flags; +spin_lock_irqsave (&ps->lock, flags); as =async_getpending (ps, arg); -if (!as) +if (!as) { +spin_unlock_irqrestore (&ps->lock, flags);return -EINVAL ; -usb_kill_urb (as->urb); + } + + urb = as->urb; +usb_get_urb (urb); +spin_unlock_irqrestore (&ps->lock, flags); + +usb_kill_urb (urb); +usb_put_urb (urb); +return 0 ; }
drivers/video/udlfb.c +80 -66
146 lines not on this page · raw message
mm/mempolicy.c +17 -24
41 lines not on this page · 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.