Linux 3.5.3
I'm announcing the release of the 3.5.4 kernel.
All users of the 3.5 kernel series must upgrade.
The updated 3.5.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.5.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/i2c/busses/i2c-i801 | 1 Makefile | 2 arch/alpha/include/asm/fpu.h | 2 arch/alpha/include/asm/socket.h | 2 arch/arm/Kconfig | 1 arch/arm/include/asm/pgtable.h | 40 +++++----- arch/arm/mach-imx/Makefile | 10 +- arch/arm/mach-imx/head-v7.S | 106 ----------------------------- arch/arm/mach-imx/headsmp.S | 106 +++++++++++++++++++++++++++++ arch/arm/mach-imx/hotplug.c | 23 ------ arch/arm/mach-s3c24xx/include/mach/dma.h | 3 arch/arm/mm/flush.c | 2 arch/arm/mm/tlb-v7.S | 6 - arch/arm/plat-omap/dmtimer.c | 2 arch/arm/plat-s3c24xx/dma.c | 2 arch/arm/vfp/vfpmodule.c | 2 arch/mips/pci/pci-ar724x.c | 22 ++++++ arch/parisc/include/asm/atomic.h | 4 - arch/powerpc/kernel/asm-offsets.c | 1 arch/powerpc/kernel/dbell.c | 2 arch/powerpc/kernel/entry_64.S | 23 ++++-- arch/powerpc/kernel/process.c | 12 --- arch/powerpc/kernel/smp.c | 11 ++- arch/powerpc/kernel/sysfs.c | 10 ++ arch/powerpc/kernel/traps.c | 3 arch/powerpc/sysdev/xics/icp-hv.c | 6 + arch/x86/kernel/microcode_amd.c | 7 + arch/x86/mm/hugetlbpage.c | 21 ++++- arch/x86/syscalls/syscall_64.tbl | 6 + arch/x86/xen/p2m.c | 95 +++++++++++++++++++++++++ arch/x86/xen/setup.c | 9 ++ drivers/acpi/acpica/tbxface.c | 1 drivers/block/cciss_scsi.c | 11 --- drivers/gpu/drm/gma500/psb_intel_display.c | 3 drivers/gpu/drm/radeon/radeon_object.c | 3 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 6 + drivers/hid/usbhid/hid-quirks.c | 1 drivers/hwmon/asus_atk0110.c | 6 + drivers/i2c/busses/Kconfig | 6 + drivers/i2c/busses/Makefile | 5 - drivers/i2c/busses/i2c-designware-core.c | 11 +++ drivers/i2c/busses/i2c-i801.c | 3 drivers/input/serio/i8042-x86ia64io.h | 14 +++ drivers/media/dvb/siano/smsusb.c | 2 drivers/media/video/gspca/jl2005bcd.c | 2 drivers/media/video/gspca/spca506.c | 2 drivers/media/video/uvc/uvc_queue.c | 1 drivers/mtd/ubi/vtbl.c | 4 - drivers/net/ethernet/intel/e1000e/e1000.h | 1 drivers/net/ethernet/intel/e1000e/netdev.c | 48 ++++++------- drivers/net/usb/usbnet.c | 2 drivers/net/wireless/ath/ath9k/pci.c | 1 drivers/net/wireless/ath/ath9k/recv.c | 2 drivers/net/wireless/p54/p54usb.c | 2 drivers/net/wireless/rtl818x/rtl8187/dev.c | 2 drivers/pci/pci-driver.c | 7 + drivers/rapidio/devices/tsi721.c | 12 +++ drivers/regulator/twl-regulator.c | 4 - drivers/scsi/megaraid/megaraid_sas_base.c | 3 drivers/scsi/mpt2sas/mpt2sas_base.c | 13 ++- drivers/scsi/scsi_error.c | 10 ++ drivers/scsi/scsi_lib.c | 5 + drivers/scsi/scsi_scan.c | 10 ++ drivers/staging/vt6656/main_usb.c | 2 drivers/staging/winbond/wbusb.c | 2 drivers/target/target_core_transport.c | 4 - drivers/usb/class/cdc-acm.c | 3 drivers/usb/misc/emi62.c | 2 drivers/video/omap2/omapfb/omapfb-main.c | 2 drivers/xen/swiotlb-xen.c | 2 drivers/xen/xen-pciback/pci_stub.c | 8 +- fs/btrfs/extent_io.c | 17 ---- fs/btrfs/volumes.c | 22 ------ fs/btrfs/volumes.h | 2 fs/buffer.c | 66 ++++++++---------- fs/compat.c | 10 ++ fs/ext3/inode.c | 17 +++- fs/fuse/dev.c | 1 fs/jbd/journal.c | 5 + fs/nfs/idmap.c | 62 ++++++++++++---- fs/nfs/nfs3proc.c | 2 fs/nfs/nfs4proc.c | 65 +++++++++++++++-- fs/nfs/pnfs.c | 39 ---------- fs/nfs/pnfs.h | 2 fs/nfs/super.c | 2 fs/nfs/write.c | 15 +++- fs/nfsd/nfs4callback.c | 4 - fs/nfsd/state.h | 1 fs/open.c | 7 + fs/ubifs/debug.h | 2 fs/ubifs/lpt.c | 5 + fs/udf/file.c | 35 +++++++-- kernel/audit_tree.c | 11 +-- kernel/fork.c | 4 - kernel/sched/core.c | 35 +++++---- kernel/sched/sched.h | 2 mm/mempolicy.c | 2 mm/mmap.c | 5 - net/bluetooth/hci_event.c | 28 ++++++- net/bluetooth/l2cap_core.c | 1 net/dccp/ccid.h | 4 - net/socket.c | 4 - net/sunrpc/svc_xprt.c | 10 +- net/sunrpc/svcsock.c | 2 sound/pci/hda/hda_codec.c | 2 sound/pci/hda/hda_proc.c | 2 sound/pci/hda/patch_ca0132.c | 8 ++ sound/soc/codecs/wm9712.c | 19 ++++- sound/soc/omap/mcbsp.c | 2 sound/usb/card.c | 4 - sound/usb/endpoint.c | 24 ++---- sound/usb/endpoint.h | 3 sound/usb/pcm.c | 61 ++++++++++++++-- 114 files changed, 881 insertions(+), 504 deletions(-)
Aaro Koskinen (1):
regulator: twl-regulator: fix up VINTANA1/VINTANA2
Al Viro (1):
vfs: missed source of ->f_pos races
Alan Cox (1):
drm: stop vmgfx driver explosion
Alan Stern (1):
HID: add NOGET quirk for Eaton Ellipse MAX UPS
Alex Deucher (2):
Revert "drm/radeon: fix bo creation retry path"
ACPI: export symbol acpi_get_table_with_size
Alexandre Bounine (2):
rapidio/tsi721: fix inbound doorbell interrupt handling rapidio/tsi721: fix unused variable compiler warning
Andreas Herrmann (1):
x86, microcode, AMD: Fix broken ucode patch size check
Anton Blanchard (4):
powerpc: Update DSCR on all CPUs when writing sysfs dscr_default
powerpc: Keep thread.dscr and thread.dscr_inherit in sync
powerpc: Fix DSCR inheritance in copy_thread()
powerpc: Restore correct DSCR in context switch
Arnd Bergmann (3):
ARM: imx: build pm-imx5 code only when PM is enabled
ARM: imx: select CPU_FREQ_TABLE when needed
ARM: imx: build i.MX6 functions only when needed
Artem Bityutskiy (3):
UBIFS: fix crash on error path
UBIFS: fix complaints about too small debug buffer size
UBI: fix a horrible memory deallocation bug
Axel Lin (1):
i2c-designware: Fix build error if CONFIG_I2C_DESIGNWARE_PLATFORM=y && CONFIG_I2C_DESIGNWARE_PCI=y
Bruce Allan (1):
e1000e: DoS while TSO enabled caused by link partner with small MSS
Bryan Schumaker (2):
NFS: Clear key construction data if the idmap upcall fails
NFS: return -ENOKEY when the upcall fails to map the name
Daniel Mack (4):
ALSA: snd-usb: Fix URB cancellation at stream start
ALSA: snd-usb: restore delay information
ALSA: snd-usb: fix calls to next_packet_size
ALSA: snd-usb: fix cross-interface streaming devices
Dave Airlie (1):
drm/vmwgfx: add MODULE_DEVICE_TABLE so vmwgfx loads at boot
Dave Jones (1):
Remove user-triggerable BUG from mpol_to_str
David Henningsson (1):
ALSA: hda - don't create dysfunctional mixer controls for ca0132
Dmitry Torokhov (1):
Input: i8042 - add Gigabyte T1005 series netbooks to noloop table
Forest Bond (1):
gma500: Consider CRTC initially active.
Gabor Juhos (1):
MIPS: pci-ar724x: avoid data bus error due to a missing PCIe module
Grazvydas Ignotas (1):
OMAPFB: fix framebuffer console colors
Greg Kroah-Hartman (9):
USB: vt6656: remove __devinit* from the struct usb_device_id table
USB: emi62: remove __devinit* from the struct usb_device_id table
USB: winbond: remove __devinit* from the struct usb_device_id table
USB: spca506: remove __devinit* from the struct usb_device_id table
USB: jl2005bcd: remove __devinit* from the struct usb_device_id table
USB: p54usb: remove __devinit* from the struct usb_device_id table
USB: rtl8187: remove __devinit* from the struct usb_device_id table
USB: smsusb: remove __devinit* from the struct usb_device_id table Linux 3.5.4
Heiko Stuebner (2):
ARM: S3C24XX: Add missing DMACH_DT_PROP
ARM: S3C24XX: Fix s3c2410_dma_enqueue parameters
Hugh Dickins (1):
block: replace __getblk_slow misfix by grow_dev_page fix
Idan Kedar (1):
pnfs: defer release of pages in layoutget
J. Bruce Fields (4):
nfsd4: fix security flavor of NFSv4.0 callback
svcrpc: fix BUG() in svc_tcp_clear_pages
svcrpc: fix svc_xprt_enqueue/svc_recv busy-looping
svcrpc: sends on closed socket should stop immediately
James Bottomley (1):
SCSI: Fix 'Device not ready' issue on mpt2sas
James Ralston (1):
i2c-i801: Add Device IDs for Intel Lynx Point-LP PCH
Jan Kara (3):
jbd: don't write superblock when unmounting an ro filesystem
udf: Fix data corruption for files in ICB
ext3: Fix fdatasync() for files with only i_size changes
Jayakrishnan Memana (1):
uvcvideo: Reset the bytesused field when recycling an erroneous buffer
Jeff Layton (1):
nfs: tear down caches in nfs_init_writepagecache when allocation fails
Jon Hunter (1):
ARM: OMAP2+: Fix dmtimer set source clock failure
Kashyap Desai (1):
SCSI: megaraid_sas: Move poll_aen_lock initializer
Konrad Rzeszutek Wilk (4):
xen/p2m: Reuse existing P2M leafs if they are filled with 1:1 PFNs or INVALID. xen/setup: Fix one-off error when adding for-balloon PFNs to the P2M. xen/p2m: Fix one-off error in checking the P2M tree directory. xen/pciback: Fix proper FLR steps.
Lorenzo Bianconi (1):
ath9k: fix decrypt_error initialization in ath_rx_tasklet()
Luca Tettamanti (1):
hwmon: (asus_atk0110) Add quirk for Asus M5A78L
Mark Brown (1):
ASoC: wm9712: Fix microphone source selection
Mathias Krause (1):
dccp: check ccid before dereferencing
Mel Gorman (1):
PARISC: Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts
Michael Cree (1):
alpha: Don't export SOCK_NONBLOCK to user space.
Michal Hocko (1):
mm: hugetlbfs: correctly populate shared pmd
Mike Frysinger (2):
alpha: fix fpu.h usage in userspace
x32: Use compat shims for {g,s}etsockopt
Mike Galbraith (1):
sched,cgroup: Fix up task_groups list
Mike Snitzer (1):
SCSI: scsi_lib: fix scsi_io_completion's SG_IO error propagation
Miklos Szeredi (4):
vfs: canonicalize create mode in build_open_flags()
audit: don't free_chunk() after fsnotify_add_mark()
audit: fix refcounting in audit-tree
fuse: fix retrieve length
Mikulas Patocka (1):
Fix order of arguments to compat_put_time[spec|val]
Oleg Nesterov (1):
uprobes: Fix mmap_region()'s mm->mm_rb corruption if uprobe_mmap() fails
Oliver Neukum (1):
usbnet: fix deadlock in resume
Paul Mackerras (1):
powerpc: Make sure IPI handlers see data written by IPI senders
Pavel Roskin (1):
ALSA: snd-usb: use list_for_each_safe for endpoint resources
Peter Ujfalusi (1):
ASoC: omap-mcbsp: Fix 6pin mux configuration
Rafael J. Wysocki (1):
PCI: EHCI: Fix crash during hibernation on ASUS computers
Rajkumar Manoharan (1):
ath9k: stop btcoex on device suspend
Ram Malovany (3):
Bluetooth: Fix using NULL inquiry entry
Bluetooth: Fix using a NULL inquiry cache entry
Bluetooth: Set name_state to unknown when entry name is empty
Ronny Hegewald (1):
xen: Use correct masking in xen_swiotlb_alloc_coherent.
Shawn Guo (1):
ARM: imx6: spin the cpu until hardware takes it down
Stanislaw Gruszka (1):
sched: fix divide by zero at {thread_group,task}_times
Stefan Behrens (1):
Btrfs: revert checksum error statistic which can cause a BUG()
Stephen M. Cameron (1):
cciss: fix incorrect scsi status reporting
Sven Schnelle (1):
USB: CDC ACM: Fix NULL pointer dereference
Szymon Janc (1):
Bluetooth: Fix legacy pairing with some devices
Takashi Iwai (2):
ALSA: hda - Fix leftover codec->power_transition
ALSA: usb-audio: Fix scheduling-while-atomic bug in PCM capture stream
Trond Myklebust (2):
NFSv3: Ensure that do_proc_get_root() reports errors correctly NFSv4.1: Remove a bogus BUG_ON() in nfs4_layoutreturn_done
Wang Xingchao (1):
ALSA: hda - fix Copyright debug message
Will Deacon (4):
ARM: 7483/1: vfp: only advertise VFPv4 in hwcaps if CONFIG_VFPv3 is enabled
ARM: 7487/1: mm: avoid setting nG bit for user mappings that aren't present
ARM: 7488/1: mm: use 5 bits for swapfile type encoding
ARM: 7489/1: errata: fix workaround for erratum #720789 on UP systems
Yi Zou (1):
target: fix NULL pointer dereference bug alloc_page() fails to get memory
[email protected] (1):
NFS: Alias the nfs module to nfs4
[email protected] (1):
SCSI: mpt2sas: Fix for Driver oops, when loading driver with max_queue_depth command line option to a very small value
Documentation/i2c/busses/i2c-i801 +1 -0
@@ -21,6 +21,7 @@ Supported adapters: * Intel DH89xxCC (PCH) * Intel Panther Point (PCH) * Intel Lynx Point (PCH) + * Intel Lynx Point-LP (PCH) Datasheets: Publicly available at the Intel website On Intel Patsburg and later chipsets, both the normal host SMBus controller
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 5 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = NAME = Saber-toothed Squirrel
arch/alpha/include/asm/fpu.h +2 -0
@@ -1,7 +1,9 @@#ifndef __ASM_ALPHA_FPU_H#define __ASM_ALPHA_FPU_H +#ifdef __KERNEL__#include <asm/special_insns.h> +#endif /* * Alpha floating-point control register defines:
arch/alpha/include/asm/socket.h +2 -0
@@ -76,9 +76,11 @@/* Instruct lower device to use last 4-bytes of skb data as FCS */ #define SO_NOFCS 43 +#ifdef __KERNEL__/* O_NONBLOCK clashes with the bits used for socket types. Therefore we * have to define SOCK_NONBLOCK to a different value here. */ #define SOCK_NONBLOCK 0x40000000 +#endif /* __KERNEL__ */ #endif /* _ASM_SOCKET_H */
arch/arm/Kconfig +1 -0
@@ -2083,6 +2083,7 @@ source "drivers/cpufreq/Kconfig" config CPU_FREQ_IMX tristate "CPUfreq driver for i.MX CPUs" depends on ARCH_MXC && CPU_FREQ + select CPU_FREQ_TABLE help This enables the CPUfreq driver for i.MX CPUs.
arch/arm/include/asm/pgtable.h +21 -19
@@ -195,6 +195,18 @@ static inline pte_t *pmd_page_vaddr(pmd_t pmd)#define pte_clear (mm,addr,ptep) set_pte_ext(ptep, __pte(0), 0) +#define pte_none (pte) (!pte_val(pte)) +#define pte_present (pte) (pte_val(pte) & L_PTE_PRESENT) +#define pte_write (pte) (!(pte_val(pte) & L_PTE_RDONLY)) +#define pte_dirty (pte) (pte_val(pte) & L_PTE_DIRTY) +#define pte_young (pte) (pte_val(pte) & L_PTE_YOUNG) +#define pte_exec (pte) (!(pte_val(pte) & L_PTE_XN)) +#define pte_special (pte) (0) + +#define pte_present_user (pte) \ + ((pte_val(pte) & (L_PTE_PRESENT | L_PTE_USER)) == \ + (L_PTE_PRESENT | L_PTE_USER)) +#if __LINUX_ARM_ARCH__ <6 static inline void __sync_icache_dcache (pte_t pteval) {
@@ -206,25 +218,15 @@ extern void __sync_icache_dcache(pte_t pteval);static inline void set_pte_at (struct mm_struct *mm,unsigned long addr,pte_t *ptep,pte_t pteval) { -if (addr >=TASK_SIZE ) -set_pte_ext (ptep, pteval,0 ); -else { +unsigned long ext =0 ; + +if (addr <TASK_SIZE &&pte_present_user (pteval)) {__sync_icache_dcache (pteval); -set_pte_ext (ptep, pteval,PTE_EXT_NG ); + ext |=PTE_EXT_NG ; } -} -#define pte_none (pte) (!pte_val(pte)) -#define pte_present (pte) (pte_val(pte) & L_PTE_PRESENT) -#define pte_write (pte) (!(pte_val(pte) & L_PTE_RDONLY)) -#define pte_dirty (pte) (pte_val(pte) & L_PTE_DIRTY) -#define pte_young (pte) (pte_val(pte) & L_PTE_YOUNG) -#define pte_exec (pte) (!(pte_val(pte) & L_PTE_XN)) -#define pte_special (pte) (0) - -#define pte_present_user (pte) \ - ((pte_val(pte) & (L_PTE_PRESENT | L_PTE_USER)) == \ - (L_PTE_PRESENT | L_PTE_USER)) +set_pte_ext (ptep, pteval, ext); +}#define PTE_BIT_FUNC (fn,op) \ static inline pte_t pte_##fn(pte_t pte) { pte_val(pte) op; return pte; }
@@ -251,13 +253,13 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)* * 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 -* <--------------- offset --------------------> <- type --> 0 0 0 +* <--------------- offset ----------------------> < type -> 0 0 0 * -* This gives us up to 63 swap files and 32GB per swap file. Note that +* This gives us up to 31 swap files and 64GB per swap file. Note that * the offset field is always non-zero. */ #define __SWP_TYPE_SHIFT 3 -#define __SWP_TYPE_BITS 6 +#define __SWP_TYPE_BITS 5#define __SWP_TYPE_MASK ((1 << __SWP_TYPE_BITS) - 1)#define __SWP_OFFSET_SHIFT (__SWP_TYPE_BITS + __SWP_TYPE_SHIFT)
arch/arm/mach-imx/Makefile +5 -5
@@ -9,7 +9,8 @@ obj-$(CONFIG_SOC_IMX27) += clk-imx27.o mm-imx27.o ehci-imx27.o obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o clk-imx31.o iomux-imx31.o ehci-imx31.o pm-imx3.o obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o clk-imx35.o ehci-imx35.o pm-imx3.o -obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o mm-imx5.o clk-imx51-imx53.o ehci-imx5.o pm-imx5.o cpu_op-mx51.o +imx5-pm-$(CONFIG_PM) += pm-imx5.o +obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o mm-imx5.o clk-imx51-imx53.o ehci-imx5.o $(imx5-pm-y) cpu_op-mx51.o obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-gate2.o \ clk-pfd.o clk-busy.o
@@ -69,14 +70,13 @@ obj-$(CONFIG_DEBUG_LL) += lluart.o obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o obj-$(CONFIG_HAVE_IMX_MMDC) += mmdc.o obj-$(CONFIG_HAVE_IMX_SRC) += src.o -obj-$(CONFIG_CPU_V7) += head-v7.o -AFLAGS_head-v7.o :=-Wa,-march=armv7-a -obj-$(CONFIG_SMP) += platsmp.o +AFLAGS_headsmp.o :=-Wa,-march=armv7-a +obj-$(CONFIG_SMP) += headsmp.o platsmp.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o obj-$(CONFIG_SOC_IMX6Q) += clk-imx6q.o mach-imx6q.o ifeq ($(CONFIG_PM),y) -obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o +obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o headsmp.o endif # i.MX5 based machines
arch/arm/mach-imx/head-v7.S deleted +0 -106
106 lines not on this page · raw message
arch/arm/mach-imx/headsmp.S new file +106 -0
106 lines not on this page · raw message
arch/arm/mach-imx/hotplug.c +3 -20
@@ -42,22 +42,6 @@ static inline void cpu_enter_lowpower(void) : "cc"); } -static inline void cpu_leave_lowpower (void ) -{ -unsigned int v; - - asmvolatile ( -"mrc p15, 0, %0, c1, c0, 0\n" -" orr %0, %0, %1\n" -" mcr p15, 0, %0, c1, c0, 0\n" -" mrc p15, 0, %0, c1, c0, 1\n" -" orr %0, %0, %2\n" -" mcr p15, 0, %0, c1, c0, 1\n" - :"=&r" (v) - :"Ir" (CR_C ),"Ir" (0x40 ) - :"cc" ); -} -/* * platform-specific code to shutdown a CPU *
@@ -67,11 +51,10 @@ void platform_cpu_die(unsigned int cpu) {cpu_enter_lowpower ();imx_enable_cpu (cpu, false); -cpu_do_idle (); -cpu_leave_lowpower (); -/* We should never return from idle */ -panic ("cpu %d unexpectedly exit from shutdown\n" , cpu); +/* spin here until hardware takes it down */ +while (1 ) + ; }int platform_cpu_disable (unsigned int cpu)
arch/arm/mach-s3c24xx/include/mach/dma.h +2 -1
@@ -24,7 +24,8 @@*/ enum dma_ch { -DMACH_XD0 , +DMACH_DT_PROP =-1 ,/* not yet supported, do not use */ +DMACH_XD0 =0 ,DMACH_XD1 ,DMACH_SDI ,DMACH_SPI0 ,
arch/arm/mm/flush.c +0 -2
@@ -231,8 +231,6 @@ void __sync_icache_dcache(pte_t pteval)struct page *page;struct address_space *mapping; -if (!pte_present_user (pteval)) -return ;if (cache_is_vipt_nonaliasing () && !pte_exec (pteval))/* only flush non-aliasing VIPT caches for exec mappings */ return ;
arch/arm/mm/tlb-v7.S +3 -3
@@ -38,10 +38,10 @@ ENTRY(v7wbi_flush_user_tlb_range) dsb mov r0, r0, lsr #PAGE_SHIFT @ align address mov r1, r1, lsr #PAGE_SHIFT -#ifdef CONFIG_ARM_ERRATA_720789 - mov r3, #0 -#else asid r3, r3 @ mask ASID +#ifdef CONFIG_ARM_ERRATA_720789 + ALT_SMP(W(mov) r3, #0 ) + ALT_UP(W(nop) ) #endif orr r0, r3, r0, lsl #PAGE_SHIFT @ Create initial MVA mov r1, r1, lsl #PAGE_SHIFT
arch/arm/plat-omap/dmtimer.c +1 -1
@@ -236,7 +236,7 @@ EXPORT_SYMBOL_GPL(omap_dm_timer_enable);void omap_dm_timer_disable (struct omap_dm_timer *timer) { -pm_runtime_put (&timer->pdev->dev); +pm_runtime_put_sync (&timer->pdev->dev); }EXPORT_SYMBOL_GPL (omap_dm_timer_disable);
arch/arm/plat-s3c24xx/dma.c +1 -1
@@ -430,7 +430,7 @@ s3c2410_dma_canload(struct s3c2410_dma_chan *chan)* when necessary. */ -int s3c2410_dma_enqueue (unsigned int channel,void *id, +int s3c2410_dma_enqueue (enum dma_ch channel,void *id,dma_addr_t data,int size) {struct s3c2410_dma_chan *chan =s3c_dma_lookup_channel (channel);
arch/arm/vfp/vfpmodule.c +2 -0
@@ -719,8 +719,10 @@ static int __init vfp_init(void)if ((fmrx (MVFR1 ) &0x000fff00 ) ==0x00011100 ) elf_hwcap |=HWCAP_NEON ;#endif +#ifdef CONFIG_VFPv3if ((fmrx (MVFR1 ) &0xf0000000 ) ==0x10000000 ) elf_hwcap |= HWCAP_VFPv4; +#endif } }return 0 ;
arch/mips/pci/pci-ar724x.c +22 -0
@@ -23,9 +23,12 @@#define AR724X_PCI_MEM_BASE 0x10000000#define AR724X_PCI_MEM_SIZE 0x08000000 +#define AR724X_PCI_REG_RESET 0x18#define AR724X_PCI_REG_INT_STATUS 0x4c#define AR724X_PCI_REG_INT_MASK 0x50 +#define AR724X_PCI_RESET_LINK_UP BIT(0) +#define AR724X_PCI_INT_DEV0 BIT(14)#define AR724X_PCI_IRQ_COUNT 1
@@ -38,6 +41,15 @@ static void __iomem *ar724x_pci_ctrl_base;static u32 ar724x_pci_bar0_value;static bool ar724x_pci_bar0_is_cached; +static bool ar724x_pci_link_up; + +static inline bool ar724x_pci_check_link (void ) +{ +u32 reset; + + reset =__raw_readl (ar724x_pci_ctrl_base +AR724X_PCI_REG_RESET ); +return reset &AR724X_PCI_RESET_LINK_UP ; +}static int ar724x_pci_read (struct pci_bus *bus,unsigned int devfn,int where,int size,uint32_t *value)
@@ -46,6 +58,9 @@ static int ar724x_pci_read(struct pci_bus *bus, unsigned int devfn, int where,void __iomem *base;u32 data; +if (!ar724x_pci_link_up) +return PCIBIOS_DEVICE_NOT_FOUND ; +if (devfn)return PCIBIOS_DEVICE_NOT_FOUND ;
@@ -96,6 +111,9 @@ static int ar724x_pci_write(struct pci_bus *bus, unsigned int devfn, int where,u32 data;int s; +if (!ar724x_pci_link_up) +return PCIBIOS_DEVICE_NOT_FOUND ; +if (devfn)return PCIBIOS_DEVICE_NOT_FOUND ;
@@ -280,6 +298,10 @@ int __init ar724x_pcibios_init(int irq)if (ar724x_pci_ctrl_base ==NULL ) goto err_unmap_devcfg; + ar724x_pci_link_up =ar724x_pci_check_link (); +if (!ar724x_pci_link_up) +pr_warn ("ar724x: PCIe link is down\n" ); +ar724x_pci_irq_init (irq);register_pci_controller (&ar724x_pci_controller);
arch/parisc/include/asm/atomic.h +2 -2
@@ -141,7 +141,7 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)#define atomic_sub_and_test (i,v) (atomic_sub_return((i),(v)) == 0) -#define ATOMIC_INIT (i) ((atomic_t) { (i) }) +#define ATOMIC_INIT (i) { (i) }#define smp_mb__before_atomic_dec () smp_mb()#define smp_mb__after_atomic_dec () smp_mb()
@@ -150,7 +150,7 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)#ifdef CONFIG_64BIT -#define ATOMIC64_INIT (i) ((atomic64_t) { (i) }) +#define ATOMIC64_INIT (i) { (i) }static __inline__s64 __atomic64_add_return (s64 i,atomic64_t *v)
arch/powerpc/kernel/asm-offsets.c +1 -0
@@ -76,6 +76,7 @@ int main(void)DEFINE (SIGSEGV ,SIGSEGV );DEFINE (NMI_MASK ,NMI_MASK );DEFINE (THREAD_DSCR , offsetof(struct thread_struct , dscr)); +DEFINE (THREAD_DSCR_INHERIT , offsetof(struct thread_struct , dscr_inherit));#else DEFINE (THREAD_INFO , offsetof(struct task_struct , stack));#endif /* CONFIG_PPC64 */
arch/powerpc/kernel/dbell.c +2 -0
@@ -28,6 +28,8 @@ void doorbell_setup_this_cpu(void)void doorbell_cause_ipi (int cpu,unsigned long data) { +/* Order previous accesses vs. msgsnd, which is treated as a store */ +mb ();ppc_msgsnd (PPC_DBELL ,0 , data); }
arch/powerpc/kernel/entry_64.S +17 -6
@@ -369,6 +369,12 @@ _GLOBAL(ret_from_fork) li r3,0 b syscall_exit + .section ".toc","aw" +DSCR_DEFAULT: + .tc dscr_default[TC],dscr_default + + .section ".text" + /* * This routine switches between two different tasks. The process * state of one is saved on its kernel stack. Then the state
@@ -508,9 +514,6 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT) mr r1,r8 /* start using new stack pointer */ std r7,PACAKSAVE(r13) - ld r6,_CCR(r1) - mtcrf 0xFF,r6 - #ifdef CONFIG_ALTIVEC BEGIN_FTR_SECTION ld r0,THREAD_VRSAVE(r4)
@@ -519,14 +522,22 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) #endif /* CONFIG_ALTIVEC */ #ifdef CONFIG_PPC64 BEGIN_FTR_SECTION + lwz r6,THREAD_DSCR_INHERIT(r4) + ld r7,DSCR_DEFAULT@toc(2) ld r0,THREAD_DSCR(r4) - cmpd r0,r25 - beq 1f + cmpwi r6,0 + bne 1f + ld r0,0(r7) +1: cmpd r0,r25 + beq 2f mtspr SPRN_DSCR,r0 -1: +2: END_FTR_SECTION_IFSET(CPU_FTR_DSCR) #endif + ld r6,_CCR(r1) + mtcrf 0xFF,r6 + /* r3-r13 are destroyed -- Cort */ REST_8GPRS(14, r1) REST_10GPRS(22, r1)
arch/powerpc/kernel/process.c +2 -10
@@ -802,16 +802,8 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,#endif /* CONFIG_PPC_STD_MMU_64 */ #ifdef CONFIG_PPC64 if (cpu_has_feature (CPU_FTR_DSCR )) { -if (current->thread.dscr_inherit) { - p->thread.dscr_inherit =1 ; - p->thread.dscr = current->thread.dscr; - }else if (0 != dscr_default) { - p->thread.dscr_inherit =1 ; - p->thread.dscr = dscr_default; - }else { - p->thread.dscr_inherit =0 ; - p->thread.dscr =0 ; - } + p->thread.dscr_inherit = current->thread.dscr_inherit; + p->thread.dscr = current->thread.dscr; }#endif
arch/powerpc/kernel/smp.c +9 -2
@@ -197,8 +197,15 @@ void smp_muxed_ipi_message_pass(int cpu, int msg)struct cpu_messages *info = &per_cpu (ipi_message, cpu);char *message = (char *)&info->messages; +/* +* Order previous accesses before accesses in the IPI handler. +*/ +smp_mb (); message[msg] =1 ; -mb (); +/* +* cause_ipi functions are required to include a full barrier +* before doing whatever causes the IPI. +*/ smp_ops->cause_ipi (cpu, info->data); }
@@ -210,7 +217,7 @@ irqreturn_t smp_ipi_demux(void)mb ();/* order any irq clear */ do { - all = xchg_local(&info->messages, 0); + all = xchg(&info->messages, 0); #ifdef __BIG_ENDIAN if (all & (1 << (24 - 8 * PPC_MSG_CALL_FUNCTION)))
arch/powerpc/kernel/sysfs.c +10 -0
@@ -194,6 +194,14 @@ static ssize_t show_dscr_default(struct device *dev,return sprintf (buf,"%lx\n" , dscr_default); } +static void update_dscr (void *dummy) +{ +if (!current->thread.dscr_inherit) { + current->thread.dscr = dscr_default; +mtspr (SPRN_DSCR , dscr_default); + } +} +static ssize_t __used store_dscr_default (struct device *dev,struct device_attribute *attr,const char *buf,size_t count)
@@ -206,6 +214,8 @@ static ssize_t __used store_dscr_default(struct device *dev,return -EINVAL ; dscr_default = val; +on_each_cpu (update_dscr,NULL ,1 ); +return count; }
arch/powerpc/kernel/traps.c +2 -1
@@ -972,8 +972,9 @@ static int emulate_instruction(struct pt_regs *regs) cpu_has_feature(CPU_FTR_DSCR)) {PPC_WARN_EMULATED (mtdscr, regs); rd = (instword >>21 ) &0x1f ; -mtspr (SPRN_DSCR , regs->gpr[rd]); + current->thread.dscr = regs->gpr[rd]; current->thread.dscr_inherit =1 ; +mtspr (SPRN_DSCR , current->thread.dscr);return 0 ; }#endif
arch/powerpc/sysdev/xics/icp-hv.c +5 -1
@@ -65,7 +65,11 @@ static inline void icp_hv_set_xirr(unsigned int value)static inline void icp_hv_set_qirr (int n_cpu ,u8 value) {int hw_cpu =get_hard_smp_processor_id (n_cpu); -long rc =plpar_hcall_norets (H_IPI , hw_cpu, value); +long rc; + +/* Make sure all previous accesses are ordered before IPI sending */ +mb (); + rc =plpar_hcall_norets (H_IPI , hw_cpu, value);if (rc !=H_SUCCESS ) {pr_err ("%s: bad return code qirr cpu=%d hw_cpu=%d mfrr=0x%x " "returned %ld\n" , __func__, n_cpu, hw_cpu, value, rc);
arch/x86/kernel/microcode_amd.c +4 -3
@@ -143,11 +143,12 @@ static int get_matching_microcode(int cpu, const u8 *ucode_ptr, unsigned int *current_size) {struct microcode_header_amd *mc_hdr; -unsigned int actual_size; +unsigned int actual_size, patch_size;u16 equiv_cpu_id;/* size of the current patch we're staring at */ - *current_size = *(u32 *)(ucode_ptr +4 ) +SECTION_HDR_SIZE ; + patch_size = *(u32 *)(ucode_ptr +4 ); + *current_size = patch_size +SECTION_HDR_SIZE ; equiv_cpu_id =find_equiv_id ();if (!equiv_cpu_id)
@@ -174,7 +175,7 @@ static int get_matching_microcode(int cpu, const u8 *ucode_ptr,/* * now that the header looks sane, verify its size */ - actual_size =verify_ucode_size (cpu, *current_size, leftover_size); + actual_size =verify_ucode_size (cpu, patch_size, leftover_size);if (!actual_size)return 0 ;
arch/x86/mm/hugetlbpage.c +16 -5
@@ -56,9 +56,16 @@ static int vma_shareable(struct vm_area_struct *vma, unsigned long addr) }/* -* search for a shareable pmd page for hugetlb. +* Search for a shareable pmd page for hugetlb. In any case calls pmd_alloc() +* and returns the corresponding pte. While this is not necessary for the +* !shared pmd case because we can allocate the pmd later as well, it makes the +* code much cleaner. pmd allocation is essential for the shared case because +* pud has to be populated inside the same i_mmap_mutex section - otherwise +* racing tasks could either miss the sharing (see huge_pte_offset) or select a +* bad pmd for sharing. */ -static void huge_pmd_share (struct mm_struct *mm,unsigned long addr,pud_t *pud) +static pte_t * +huge_pmd_share (struct mm_struct *mm,unsigned long addr,pud_t *pud) {struct vm_area_struct *vma =find_vma (mm, addr);struct address_space *mapping = vma->vm_file->f_mapping;
@@ -68,9 +75,10 @@ static void huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud)struct vm_area_struct *svma;unsigned long saddr;pte_t *spte =NULL ; +pte_t *pte;if (!vma_shareable (vma, addr)) -return ; +return (pte_t *)pmd_alloc (mm, pud, addr);mutex_lock (&mapping->i_mmap_mutex); vma_prio_tree_foreach(svma, &iter, &mapping->i_mmap, idx, idx) {
@@ -97,7 +105,9 @@ static void huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud)put_page (virt_to_page (spte));spin_unlock (&mm->page_table_lock); out: + pte = (pte_t *)pmd_alloc (mm, pud, addr);mutex_unlock (&mapping->i_mmap_mutex); +return pte; }/*
@@ -142,8 +152,9 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, }else {BUG_ON (sz !=PMD_SIZE );if (pud_none (*pud)) -huge_pmd_share (mm, addr, pud); - pte = (pte_t *)pmd_alloc (mm, pud, addr); + pte =huge_pmd_share (mm, addr, pud); +else + pte = (pte_t *)pmd_alloc (mm, pud, addr); } }BUG_ON (pte && !pte_none (*pte) && !pte_huge (*pte));
arch/x86/syscalls/syscall_64.tbl +4 -2
@@ -60,8 +60,8 @@ 51 common getsockname sys_getsockname 52 common getpeername sys_getpeername 53 common socketpair sys_socketpair -54 common setsockopt sys_setsockopt -55 common getsockopt sys_getsockopt +54 64 setsockopt sys_setsockopt +55 64 getsockopt sys_getsockopt 56 common clone stub_clone 57 common fork stub_fork 58 common vfork stub_vfork
@@ -353,3 +353,5 @@ 538 x32 sendmmsg compat_sys_sendmmsg 539 x32 process_vm_readv compat_sys_process_vm_readv 540 x32 process_vm_writev compat_sys_process_vm_writev +541 x32 setsockopt compat_sys_setsockopt +542 x32 getsockopt compat_sys_getsockopt
arch/x86/xen/p2m.c +92 -3
113 lines not on this page · raw message
arch/x86/xen/setup.c +8 -1
@@ -78,9 +78,16 @@ static void __init xen_add_extra_mem(u64 start, u64 size)memblock_reserve (start, size); xen_max_p2m_pfn =PFN_DOWN (start + size); +for (pfn =PFN_DOWN (start); pfn < xen_max_p2m_pfn; pfn++) { +unsigned long mfn =pfn_to_mfn (pfn); + +if (WARN (mfn == pfn,"Trying to over-write 1-1 mapping (pfn: %lx)\n" , pfn)) +continue ; +WARN (mfn !=INVALID_P2M_ENTRY ,"Trying to remove %lx which has %lx mfn!\n" , + pfn, mfn); -for (pfn =PFN_DOWN (start); pfn <= xen_max_p2m_pfn; pfn++)__set_phys_to_machine (pfn,INVALID_P2M_ENTRY ); + } } static unsigned long __init xen_do_chunk(unsigned long start,
drivers/acpi/acpica/tbxface.c +1 -0
@@ -436,6 +436,7 @@ acpi_get_table_with_size(char *signature,return (AE_NOT_FOUND ); } +ACPI_EXPORT_SYMBOL (acpi_get_table_with_size) acpi_status acpi_get_table(char *signature,
drivers/block/cciss_scsi.c +1 -10
@@ -763,16 +763,7 @@ static void complete_scsi_command(CommandList_struct *c, int timeout, {case CMD_TARGET_STATUS :/* Pass it up to the upper layers... */ -if ( ei->ScsiStatus) - { -#if 0 -printk (KERN_WARNING "cciss: cmd %p " -"has SCSI Status = %x\n" , - c, ei->ScsiStatus); -#endif - cmd->result |= (ei->ScsiStatus <<1 ); - } -else {/* scsi status is zero??? How??? */ +if (!ei->ScsiStatus) {/* Ordinarily, this case should never happen, but there is a bug in some released firmware revisions that allows it to happen
drivers/gpu/drm/gma500/psb_intel_display.c +3 -0
@@ -1362,6 +1362,9 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe, (struct drm_connector **) (psb_intel_crtc +1 ); psb_intel_crtc->mode_set.num_connectors =0 ;psb_intel_cursor_init (dev, psb_intel_crtc); + +/* Set to true so that the pipe is forced off on initial config. */ + psb_intel_crtc->active = true; } int psb_intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
drivers/gpu/drm/radeon/radeon_object.c +1 -2
@@ -138,6 +138,7 @@ int radeon_bo_create(struct radeon_device *rdev, acc_size =ttm_bo_dma_acc_size (&rdev->mman.bdev, size,sizeof (struct radeon_bo )); +retry: bo =kzalloc (sizeof (struct radeon_bo ),GFP_KERNEL );if (bo ==NULL )return -ENOMEM ;
@@ -151,8 +152,6 @@ int radeon_bo_create(struct radeon_device *rdev, bo->surface_reg =-1 ;INIT_LIST_HEAD (&bo->list);INIT_LIST_HEAD (&bo->va); - -retry:radeon_ttm_placement_from_domain (bo, domain);/* Kernel allocation are uninterruptible */ mutex_lock (&rdev->vram_mutex);
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +1 -0
@@ -182,6 +182,7 @@ static struct pci_device_id vmw_pci_id_list[] = { {0x15ad, 0x0405, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VMWGFX_CHIP_SVGAII}, {0, 0, 0} }; +MODULE_DEVICE_TABLE (pci, vmw_pci_id_list);static int enable_fbdev;
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +5 -1
@@ -1688,15 +1688,19 @@ int vmw_du_page_flip(struct drm_crtc *crtc,struct vmw_private *dev_priv =vmw_priv (crtc->dev);struct drm_framebuffer *old_fb = crtc->fb;struct vmw_framebuffer *vfb =vmw_framebuffer_to_vfb (fb); -struct drm_file *file_priv = event->base.file_priv; +struct drm_file *file_priv ;struct vmw_fence_obj *fence =NULL ;struct drm_clip_rect clips;int ret; +if (event ==NULL ) +return -EINVAL ; +/* require ScreenObject support for page flipping */ if (!dev_priv->sou_priv)return -ENOSYS ; + file_priv = event->base.file_priv;if (!vmw_kms_screen_object_flippable (dev_priv, crtc))return -EINVAL ;
drivers/hid/usbhid/hid-quirks.c +1 -0
@@ -70,6 +70,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_AXIS_295, HID_QUIRK_NOGET }, { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET }, { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET }, + { USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET }, { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN2, HID_QUIRK_NO_INIT_REPORTS },
drivers/hwmon/asus_atk0110.c +6 -0
@@ -34,6 +34,12 @@ static const struct dmi_system_id __initconst atk_force_new_if[] = { .matches = { DMI_MATCH(DMI_BOARD_NAME, "SABERTOOTH X58") } + }, { +/* Old interface reads the same sensor for fan0 and fan1 */ + .ident = "Asus M5A78L", + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "M5A78L") + } }, { } };
drivers/i2c/busses/Kconfig +6 -0
@@ -104,6 +104,7 @@ config I2C_I801 DH89xxCC (PCH) Panther Point (PCH) Lynx Point (PCH) + Lynx Point-LP (PCH) This driver can also be built as a module. If so, the module will be called i2c-i801.
@@ -350,9 +351,13 @@ config I2C_DAVINCI devices such as DaVinci NIC. For details please see http://www.ti.com/davinci +config I2C_DESIGNWARE_CORE + tristate + config I2C_DESIGNWARE_PLATFORM tristate "Synopsys DesignWare Platform" depends on HAVE_CLK + select I2C_DESIGNWARE_CORE help If you say yes to this option, support will be included for the Synopsys DesignWare I2C adapter. Only master mode is supported.
@@ -363,6 +368,7 @@ config I2C_DESIGNWARE_PLATFORM config I2C_DESIGNWARE_PCI tristate "Synopsys DesignWare PCI" depends on PCI + select I2C_DESIGNWARE_CORE help If you say yes to this option, support will be included for the Synopsys DesignWare I2C adapter. Only master mode is supported.
drivers/i2c/busses/Makefile +3 -2
@@ -33,10 +33,11 @@ obj-$(CONFIG_I2C_AU1550) += i2c-au1550.o obj-$(CONFIG_I2C_BLACKFIN_TWI) += i2c-bfin-twi.o obj-$(CONFIG_I2C_CPM) += i2c-cpm.o obj-$(CONFIG_I2C_DAVINCI) += i2c-davinci.o +obj-$(CONFIG_I2C_DESIGNWARE_CORE) += i2c-designware-core.o obj-$(CONFIG_I2C_DESIGNWARE_PLATFORM) += i2c-designware-platform.o -i2c-designware-platform-objs := i2c-designware-platdrv.o i2c-designware-core.o +i2c-designware-platform-objs := i2c-designware-platdrv.o obj-$(CONFIG_I2C_DESIGNWARE_PCI) += i2c-designware-pci.o -i2c-designware-pci-objs := i2c-designware-pcidrv.o i2c-designware-core.o +i2c-designware-pci-objs := i2c-designware-pcidrv.o obj-$(CONFIG_I2C_EG20T) += i2c-eg20t.o obj-$(CONFIG_I2C_GPIO) += i2c-gpio.o obj-$(CONFIG_I2C_HIGHLANDER) += i2c-highlander.o
drivers/i2c/busses/i2c-designware-core.c +11 -0
@@ -25,6 +25,7 @@* ---------------------------------------------------------------------------- * */ +#include <linux/export.h> #include <linux/clk.h> #include <linux/errno.h> #include <linux/err.h>
@@ -316,6 +317,7 @@ int i2c_dw_init(struct dw_i2c_dev *dev)dw_writel (dev, dev->master_cfg ,DW_IC_CON );return 0 ; } +EXPORT_SYMBOL_GPL (i2c_dw_init);/* * Waiting for bus not busy
@@ -568,12 +570,14 @@ done:return ret; } +EXPORT_SYMBOL_GPL (i2c_dw_xfer);u32 i2c_dw_func (struct i2c_adapter *adap) {struct dw_i2c_dev *dev =i2c_get_adapdata (adap);return dev->functionality; } +EXPORT_SYMBOL_GPL (i2c_dw_func);static u32 i2c_dw_read_clear_intrbits (struct dw_i2c_dev *dev) {
@@ -678,17 +682,20 @@ tx_aborted:return IRQ_HANDLED ; } +EXPORT_SYMBOL_GPL (i2c_dw_isr);void i2c_dw_enable (struct dw_i2c_dev *dev) {/* Enable the adapter */ dw_writel (dev,1 ,DW_IC_ENABLE ); } +EXPORT_SYMBOL_GPL (i2c_dw_enable);u32 i2c_dw_is_enabled (struct dw_i2c_dev *dev) {return dw_readl (dev,DW_IC_ENABLE ); } +EXPORT_SYMBOL_GPL (i2c_dw_is_enabled);void i2c_dw_disable (struct dw_i2c_dev *dev) {
@@ -699,18 +706,22 @@ void i2c_dw_disable(struct dw_i2c_dev *dev)dw_writel (dev,0 ,DW_IC_INTR_MASK );dw_readl (dev,DW_IC_CLR_INTR ); } +EXPORT_SYMBOL_GPL (i2c_dw_disable);void i2c_dw_clear_int (struct dw_i2c_dev *dev) {dw_readl (dev,DW_IC_CLR_INTR ); } +EXPORT_SYMBOL_GPL (i2c_dw_clear_int);void i2c_dw_disable_int (struct dw_i2c_dev *dev) {dw_writel (dev,0 ,DW_IC_INTR_MASK ); } +EXPORT_SYMBOL_GPL (i2c_dw_disable_int);u32 i2c_dw_read_comp_param (struct dw_i2c_dev *dev) {return dw_readl (dev,DW_IC_COMP_PARAM_1 ); } +EXPORT_SYMBOL_GPL (i2c_dw_read_comp_param);
drivers/i2c/busses/i2c-i801.c +3 -0
@@ -52,6 +52,7 @@ DH89xxCC (PCH) 0x2330 32 hard yes yes yes Panther Point (PCH) 0x1e22 32 hard yes yes yes Lynx Point (PCH) 0x8c22 32 hard yes yes yes + Lynx Point-LP (PCH) 0x9c22 32 hard yes yes yes Features supported by this driver: Software PEC no
@@ -147,6 +148,7 @@#define PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS 0x2330#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS 0x3b30#define PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS 0x8c22 +#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_SMBUS 0x9c22struct i801_priv {struct i2c_adapter adapter;
@@ -636,6 +638,7 @@ static DEFINE_PCI_DEVICE_TABLE(i801_ids) = { { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PANTHERPOINT_SMBUS) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNXPOINT_SMBUS) }, + { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_SMBUS) }, { 0, } };
drivers/input/serio/i8042-x86ia64io.h +14 -0
@@ -177,6 +177,20 @@ static const struct dmi_system_id __initconst i8042_dmi_noloop_table[] = { }, }, { +/* Gigabyte T1005 - defines wrong chassis type ("Other") */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"GIGABYTE" ), + DMI_MATCH(DMI_PRODUCT_NAME, "T1005"), + }, + }, + { +/* Gigabyte T1005M/P - defines wrong chassis type ("Other") */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"GIGABYTE" ), + DMI_MATCH(DMI_PRODUCT_NAME, "T1005M/P"), + }, + }, + { .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv9700"),
drivers/media/dvb/siano/smsusb.c +1 -1
@@ -481,7 +481,7 @@ static int smsusb_resume(struct usb_interface *intf)return 0 ; } -static const struct usb_device_id smsusb_id_table[]__devinitconst = { +static const struct usb_device_id smsusb_id_table[] = { {USB_DEVICE (0x187f ,0x0010 ), .driver_info =SMS1XXX_BOARD_SIANO_STELLAR }, {USB_DEVICE (0x187f ,0x0100 ),
drivers/media/video/gspca/jl2005bcd.c +1 -1
@@ -514,7 +514,7 @@ static const struct sd_desc sd_desc = { };/* -- module initialisation -- */ -static const __devinitdata struct usb_device_id device_table[] = { +static const struct usb_device_id device_table[] = { {USB_DEVICE (0x0979 ,0x0227 )}, {} };
drivers/media/video/gspca/spca506.c +1 -1
@@ -685,7 +685,7 @@ static const struct sd_desc sd_desc = { };/* -- module initialisation -- */ -static const struct usb_device_id device_table[]__devinitconst = { +static const struct usb_device_id device_table[] = { {USB_DEVICE (0x06e1 ,0xa190 )},/*fixme: may be IntelPCCameraPro BRIDGE_SPCA505 {USB_DEVICE(0x0733, 0x0430)}, */
drivers/media/video/uvc/uvc_queue.c +1 -0
@@ -338,6 +338,7 @@ struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue,if ((queue->flags &UVC_QUEUE_DROP_CORRUPTED ) && buf->error) { buf->error =0 ; buf->state =UVC_BUF_STATE_QUEUED ; + buf->bytesused =0 ;vb2_set_plane_payload (&buf->buf,0 ,0 );return buf; }
drivers/mtd/ubi/vtbl.c +2 -2
@@ -340,7 +340,7 @@ retry:* of this LEB as it will be deleted and freed in 'ubi_add_to_av()'. */ err =ubi_add_to_av (ubi, ai, new_aeb->pnum, new_aeb->ec, vid_hdr,0 ); -kfree (new_aeb); +kmem_cache_free (ai->aeb_slab_cache, new_aeb);ubi_free_vid_hdr (ubi, vid_hdr);return err;
@@ -353,7 +353,7 @@ write_error:list_add (&new_aeb->u.list, &ai->erase); goto retry; } -kfree (new_aeb); +kmem_cache_free (ai->aeb_slab_cache, new_aeb); out_free:ubi_free_vid_hdr (ubi, vid_hdr);return err;
drivers/net/ethernet/intel/e1000e/e1000.h +1 -0
@@ -310,6 +310,7 @@ struct e1000_adapter {*/ struct e1000_ring *tx_ring/* One per active queue */ ____cacheline_aligned_in_smp ; +u32 tx_fifo_limit;struct napi_struct napi;
drivers/net/ethernet/intel/e1000e/netdev.c +23 -25
114 lines not on this page · raw message
drivers/net/usb/usbnet.c +1 -1
@@ -1580,7 +1580,7 @@ int usbnet_resume (struct usb_interface *intf) netif_device_present(dev->net) && !timer_pending(&dev->delay) && !test_bit(EVENT_RX_HALT, &dev->flags)) -rx_alloc_submit (dev,GFP_KERNEL ); +rx_alloc_submit (dev,GFP_NOIO );if (!(dev->txq.qlen >=TX_QLEN (dev)))netif_tx_wake_all_queues (dev->net);
drivers/net/wireless/ath/ath9k/pci.c +1 -0
@@ -313,6 +313,7 @@ static int ath_pci_suspend(struct device *device)* Otherwise the chip never moved to full sleep, * when no interface is up. */ +ath9k_stop_btcoex (sc);ath9k_hw_disable (sc->sc_ah);ath9k_hw_setpower (sc->sc_ah,ATH9K_PM_FULL_SLEEP );
drivers/net/wireless/ath/ath9k/recv.c +1 -1
@@ -1781,7 +1781,6 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)struct ieee80211_hw *hw = sc->hw;struct ieee80211_hdr *hdr;int retval; -bool decrypt_error = false;struct ath_rx_status rs;enum ath9k_rx_qtype qtype;bool edma = !!(ah->caps.hw_caps &ATH9K_HW_CAP_EDMA );
@@ -1803,6 +1802,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) tsf_lower = tsf &0xffffffff ; do { + bool decrypt_error = false; /* If handling rx interrupt and flush is in progress => exit */ if ((sc->sc_flags & SC_OP_RXFLUSH) && (flush == 0)) break;
drivers/net/wireless/p54/p54usb.c +1 -1
@@ -42,7 +42,7 @@ MODULE_FIRMWARE("isl3887usb");* whenever you add a new device. */ -static struct usb_device_id p54u_table[]__devinitdata = { +static struct usb_device_id p54u_table[] = {/* Version 1 devices (pci chip + net2280) */ {USB_DEVICE (0x0411 ,0x0050 )},/* Buffalo WLI2-USB2-G54 */ {USB_DEVICE (0x045e ,0x00c2 )},/* Microsoft MN-710 */
drivers/net/wireless/rtl818x/rtl8187/dev.c +1 -1
@@ -44,7 +44,7 @@ MODULE_AUTHOR("Larry Finger <[email protected]>");MODULE_DESCRIPTION ("RTL8187/RTL8187B USB wireless driver" );MODULE_LICENSE ("GPL" ); -static struct usb_device_id rtl8187_table[]__devinitdata = { +static struct usb_device_id rtl8187_table[] = {/* Asus */ {USB_DEVICE (0x0b05 ,0x171d ), .driver_info =DEVICE_RTL8187 },/* Belkin */
drivers/pci/pci-driver.c +7 -0
@@ -958,6 +958,13 @@ static int pci_pm_poweroff_noirq(struct device *dev)if (!pci_dev->state_saved && !pci_is_bridge (pci_dev))pci_prepare_to_sleep (pci_dev); +/* +* The reason for doing this here is the same as for the analogous code +* in pci_pm_suspend_noirq(). +*/ +if (pci_dev->class ==PCI_CLASS_SERIAL_USB_EHCI ) +pci_write_config_word (pci_dev,PCI_COMMAND ,0 ); +return 0 ; }
drivers/rapidio/devices/tsi721.c +11 -1
@@ -435,6 +435,9 @@ static void tsi721_db_dpc(struct work_struct *work)" info %4.4x\n" ,DBELL_SID (idb.bytes), DBELL_TID(idb.bytes), DBELL_INF(idb.bytes)); } + + wr_ptr =ioread32 (priv->regs + +TSI721_IDQ_WP (IDB_QUEUE )) %IDB_QSIZE ; } iowrite32(rd_ptr & (IDB_QSIZE - 1),
@@ -445,6 +448,10 @@ static void tsi721_db_dpc(struct work_struct *work) regval |=TSI721_SR_CHINT_IDBQRCV ;iowrite32 (regval, priv->regs +TSI721_SR_CHINTE (IDB_QUEUE )); + + wr_ptr =ioread32 (priv->regs +TSI721_IDQ_WP (IDB_QUEUE )) %IDB_QSIZE ; +if (wr_ptr != rd_ptr) +schedule_work (&priv->idb_work); }/**
@@ -2212,7 +2219,7 @@ static int __devinit tsi721_probe(struct pci_dev *pdev, const struct pci_device_id *id) {struct tsi721_device *priv; -int i, cap; +int cap;int err;u32 regval;
@@ -2232,12 +2239,15 @@ static int __devinit tsi721_probe(struct pci_dev *pdev, priv->pdev = pdev;#ifdef DEBUG + { +int i;for (i =0 ; i <=PCI_STD_RESOURCE_END ; i++) {dev_dbg (&pdev->dev,"res[%d] @ 0x%llx (0x%lx, 0x%lx)\n" , i, (unsigned long long )pci_resource_start (pdev, i), (unsigned long )pci_resource_len (pdev, i),pci_resource_flags (pdev, i)); } + }#endif /* * Verify BAR configuration
drivers/regulator/twl-regulator.c +2 -2
@@ -1065,7 +1065,7 @@ TWL6025_ADJUSTABLE_LDO(LDO7, 0x74, 1000, 3300);TWL6025_ADJUSTABLE_LDO (LDO6 ,0x60 ,1000 ,3300 );TWL6025_ADJUSTABLE_LDO (LDOLN ,0x64 ,1000 ,3300 );TWL6025_ADJUSTABLE_LDO (LDOUSB ,0x70 ,1000 ,3300 ); -TWL4030_FIXED_LDO (VINTANA2 ,0x3f ,1500 ,11 ,100 ,0x08 ); +TWL4030_FIXED_LDO (VINTANA1 ,0x3f ,1500 ,11 ,100 ,0x08 );TWL4030_FIXED_LDO (VINTDIG ,0x47 ,1500 ,13 ,100 ,0x08 );TWL4030_FIXED_LDO (VUSB1V5 ,0x71 ,1500 ,17 ,100 ,0x08 );TWL4030_FIXED_LDO (VUSB1V8 ,0x74 ,1800 ,18 ,100 ,0x08 );
@@ -1146,7 +1146,7 @@ static const struct of_device_id twl_of_match[] __devinitconst = {TWL6025_OF_MATCH ("ti,twl6025-ldo6" ,LDO6 ),TWL6025_OF_MATCH ("ti,twl6025-ldoln" ,LDOLN ),TWL6025_OF_MATCH ("ti,twl6025-ldousb" ,LDOUSB ), -TWLFIXED_OF_MATCH ("ti,twl4030-vintana2" ,VINTANA2 ), +TWLFIXED_OF_MATCH ("ti,twl4030-vintana1" ,VINTANA1 ),TWLFIXED_OF_MATCH ("ti,twl4030-vintdig" ,VINTDIG ),TWLFIXED_OF_MATCH ("ti,twl4030-vusb1v5" ,VUSB1V5 ), TWLFIXED_OF_MATCH("ti,twl4030-vusb1v8", VUSB1V8),
drivers/scsi/megaraid/megaraid_sas_base.c +2 -1
@@ -4066,7 +4066,6 @@ megasas_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)spin_lock_init (&instance->cmd_pool_lock);spin_lock_init (&instance->hba_lock);spin_lock_init (&instance->completion_lock); -spin_lock_init (&poll_aen_lock);mutex_init (&instance->aen_mutex);mutex_init (&instance->reset_mutex);
@@ -5392,6 +5391,8 @@ static int __init megasas_init(void)printk (KERN_INFO "megasas: %s %s\n" ,MEGASAS_VERSION ,MEGASAS_EXT_VERSION ); +spin_lock_init (&poll_aen_lock); + support_poll_for_event =2 ; support_device_change =1 ;
drivers/scsi/mpt2sas/mpt2sas_base.c +8 -5
@@ -2424,10 +2424,13 @@ _base_allocate_memory_pools(struct MPT2SAS_ADAPTER *ioc, int sleep_flag) }/* command line tunables for max controller queue depth */ -if (max_queue_depth !=-1 ) - max_request_credit = (max_queue_depth < facts->RequestCredit) - ? max_queue_depth : facts->RequestCredit; -else +if (max_queue_depth !=-1 && max_queue_depth !=0 ) { + max_request_credit =min_t (u16, max_queue_depth + + ioc->hi_priority_depth + ioc->internal_depth, + facts->RequestCredit); +if (max_request_credit >MAX_HBA_QUEUE_DEPTH ) + max_request_credit =MAX_HBA_QUEUE_DEPTH ; + }else max_request_credit =min_t (u16, facts->RequestCredit,MAX_HBA_QUEUE_DEPTH );
@@ -2502,7 +2505,7 @@ _base_allocate_memory_pools(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)/* set the scsi host can_queue depth * with some internal commands that could be outstanding */ - ioc->shost->can_queue = ioc->scsiio_depth - (2 ); + ioc->shost->can_queue = ioc->scsiio_depth;dinitprintk (ioc,printk (MPT2SAS_INFO_FMT "scsi host: " "can_queue depth (%d)\n" , ioc->name, ioc->shost->can_queue));
drivers/scsi/scsi_error.c +10 -0
@@ -42,6 +42,8 @@#include <trace/events/scsi.h> +static void scsi_eh_done (struct scsi_cmnd *scmd); +#define SENSE_TIMEOUT (10*HZ)/*
@@ -241,6 +243,14 @@ static int scsi_check_sense(struct scsi_cmnd *scmd)if (!scsi_command_normalize_sense (scmd, &sshdr))return FAILED ;/* no valid sense data */ +if (scmd->cmnd[0 ] ==TEST_UNIT_READY && scmd->scsi_done != scsi_eh_done) +/* +* nasty: for mid-layer issued TURs, we need to return the +* actual sense data without any recovery attempt. For eh +* issued ones, we need to try to recover and interpret +*/ +return SUCCESS ; +if (scsi_sense_is_deferred (&sshdr))return NEEDS_RETRY ;
drivers/scsi/scsi_lib.c +4 -1
@@ -760,7 +760,6 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes) }if (req->cmd_type ==REQ_TYPE_BLOCK_PC ) {/* SG_IO ioctl from block level */ - req->errors = result;if (result) {if (sense_valid && req->sense) {/*
@@ -776,6 +775,10 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)if (!sense_deferred) error =__scsi_error_from_host_byte (cmd, result); } +/* +* __scsi_error_from_host_byte may have reset the host_byte +*/ + req->errors = cmd->result; req->resid_len =scsi_get_resid (cmd);
drivers/scsi/scsi_scan.c +10 -0
@@ -779,6 +779,16 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result, sdev->model = (char *) (sdev->inquiry +16 ); sdev->rev = (char *) (sdev->inquiry +32 ); +if (strncmp (sdev->vendor,"ATA " ,8 ) ==0 ) { +/* +* sata emulation layer device. This is a hack to work around +* the SATL power management specifications which state that +* when the SATL detects the device has gone into standby +* mode, it shall respond with NOT READY. +*/ + sdev->allow_restart =1 ; + } +if (*bflags &BLIST_ISROM ) { sdev->type =TYPE_ROM ; sdev->removable =1 ;
drivers/staging/vt6656/main_usb.c +1 -1
@@ -222,7 +222,7 @@ DEVICE_PARAM(b80211hEnable, "802.11h mode");// Static vars definitions // -static struct usb_device_id vt6656_table[]__devinitdata = { +static struct usb_device_id vt6656_table[] = { {USB_DEVICE (VNT_USB_VENDOR_ID ,VNT_USB_PRODUCT_ID )}, {} };
drivers/staging/winbond/wbusb.c +1 -1
@@ -25,7 +25,7 @@ MODULE_DESCRIPTION("IS89C35 802.11bg WLAN USB Driver");MODULE_LICENSE ("GPL" );MODULE_VERSION ("0.1" ); -static const struct usb_device_id wb35_table[]__devinitconst = { +static const struct usb_device_id wb35_table[] = { {USB_DEVICE (0x0416 ,0x0035 ) }, {USB_DEVICE (0x18E8 ,0x6201 ) }, {USB_DEVICE (0x18E8 ,0x6206 ) },
drivers/target/target_core_transport.c +2 -2
@@ -3477,9 +3477,9 @@ transport_generic_get_mem(struct se_cmd *cmd)return 0 ; out: -while (i >=0 ) { -__free_page (sg_page (&cmd->t_data_sg[i])); +while (i >0 ) { i--; +__free_page (sg_page (&cmd->t_data_sg[i])); }kfree (cmd->t_data_sg); cmd->t_data_sg =NULL ;
drivers/usb/class/cdc-acm.c +2 -1
@@ -1104,7 +1104,8 @@ skip_normal_probe: } -if (data_interface->cur_altsetting->desc.bNumEndpoints <2 ) +if (data_interface->cur_altsetting->desc.bNumEndpoints <2 || + control_interface->cur_altsetting->desc.bNumEndpoints ==0 )return -EINVAL ; epctrl = &control_interface->cur_altsetting->endpoint[0 ].desc;
drivers/usb/misc/emi62.c +1 -1
@@ -232,7 +232,7 @@ wraperr:return err; } -static const struct usb_device_id id_table[]__devinitconst = { +static const struct usb_device_id id_table[] = { {USB_DEVICE (EMI62_VENDOR_ID ,EMI62_PRODUCT_ID ) }, { }/* Terminating entry */ };
drivers/video/omap2/omapfb/omapfb-main.c +1 -1
@@ -1188,7 +1188,7 @@ static int _setcolreg(struct fb_info *fbi, u_int regno, u_int red, u_int green,break ;if (regno <16 ) { -u16 pal; +u32 pal; pal = ((red >> (16 - var->red.length)) << var->red.offset) | ((green >> (16 - var->green.length)) <<
drivers/xen/swiotlb-xen.c +1 -1
@@ -232,7 +232,7 @@ xen_swiotlb_alloc_coherent(struct device *hwdev, size_t size,return ret;if (hwdev && hwdev->coherent_dma_mask) - dma_mask = hwdev->coherent_dma_mask; + dma_mask =dma_alloc_coherent_mask (hwdev, flags); phys =virt_to_phys (ret); dev_addr =xen_phys_to_bus (phys);
drivers/xen/xen-pciback/pci_stub.c +4 -4
@@ -353,16 +353,16 @@ static int __devinit pcistub_init_device(struct pci_dev *dev)if (err) goto config_release; -dev_dbg (&dev->dev,"reseting (FLR, D3, etc) the device\n" ); -__pci_reset_function_locked (dev); -/* We need the device active to save the state. */ dev_dbg (&dev->dev,"save state of device\n" );pci_save_state (dev); dev_data->pci_saved_state =pci_store_saved_state (dev);if (!dev_data->pci_saved_state)dev_err (&dev->dev,"Could not store PCI conf saved state!\n" ); - +else { +dev_dbg (&dev->dev,"reseting (FLR, D3, etc) the device\n" ); +__pci_reset_function_locked (dev); + }/* Now disable the device (this also ensures some private device * data is setup before we export) */
fs/btrfs/extent_io.c +2 -15
@@ -2329,23 +2329,10 @@ static void end_bio_extent_readpage(struct bio *bio, int err)if (uptodate && tree->ops && tree->ops->readpage_end_io_hook) { ret = tree->ops->readpage_end_io_hook (page, start, end, state, mirror); -if (ret) { -/* no IO indicated but software detected errors -* in the block, either checksum errors or -* issues with the contents */ -struct btrfs_root *root = -BTRFS_I (page->mapping->host)->root; -struct btrfs_device *device; - +if (ret) uptodate =0 ; - device =btrfs_find_device_for_logical ( - root, start, mirror); -if (device) -btrfs_dev_stat_inc_and_print (device, -BTRFS_DEV_STAT_CORRUPTION_ERRS ); - }else { +else clean_io_failure (start, page); - } }if (!uptodate && tree->ops && tree->ops->readpage_io_failed_hook) {
fs/btrfs/volumes.c +0 -22
@@ -4602,28 +4602,6 @@ int btrfs_read_sys_array(struct btrfs_root *root)return ret; } -struct btrfs_device *btrfs_find_device_for_logical (struct btrfs_root *root, -u64 logical,int mirror_num) -{ -struct btrfs_mapping_tree *map_tree = &root->fs_info->mapping_tree; -int ret; -u64 map_length =0 ; -struct btrfs_bio *bbio =NULL ; -struct btrfs_device *device; - -BUG_ON (mirror_num ==0 ); - ret =btrfs_map_block (map_tree,WRITE , logical, &map_length, &bbio, - mirror_num); -if (ret) { -BUG_ON (bbio !=NULL ); -return NULL ; - } -BUG_ON (mirror_num != bbio->mirror_num); - device = bbio->stripes[mirror_num -1 ].dev; -kfree (bbio); -return device; -} -int btrfs_read_chunk_tree (struct btrfs_root *root) {struct btrfs_path *path;
fs/btrfs/volumes.h +0 -2
@@ -288,8 +288,6 @@ int btrfs_cancel_balance(struct btrfs_fs_info *fs_info);int btrfs_chunk_readonly (struct btrfs_root *root,u64 chunk_offset);int find_free_dev_extent (struct btrfs_device *device,u64 num_bytes,u64 *start,u64 *max_avail); -struct btrfs_device *btrfs_find_device_for_logical (struct btrfs_root *root, -u64 logical,int mirror_num);void btrfs_dev_stat_print_on_error (struct btrfs_device *device);void btrfs_dev_stat_inc_and_print (struct btrfs_device *dev,int index); int btrfs_get_dev_stats(struct btrfs_root *root,
fs/buffer.c +30 -36
144 lines not on this page · raw message
fs/compat.c +8 -2
@@ -1155,11 +1155,14 @@ compat_sys_readv(unsigned long fd, const struct compat_iovec __user *vec,struct file *file;int fput_needed;ssize_t ret; +loff_t pos; file =fget_light (fd, &fput_needed);if (!file)return -EBADF ; - ret =compat_readv (file, vec, vlen, &file->f_pos); + pos = file->f_pos; + ret =compat_readv (file, vec, vlen, &pos); + file->f_pos = pos;fput_light (file, fput_needed);return ret; }
@@ -1221,11 +1224,14 @@ compat_sys_writev(unsigned long fd, const struct compat_iovec __user *vec,struct file *file;int fput_needed;ssize_t ret; +loff_t pos; file =fget_light (fd, &fput_needed);if (!file)return -EBADF ; - ret =compat_writev (file, vec, vlen, &file->f_pos); + pos = file->f_pos; + ret =compat_writev (file, vec, vlen, &pos); + file->f_pos = pos;fput_light (file, fput_needed);return ret; }
fs/ext3/inode.c +14 -3
@@ -3072,6 +3072,8 @@ static int ext3_do_update_inode(handle_t *handle,struct ext3_inode_info *ei =EXT3_I (inode);struct buffer_head *bh = iloc->bh;int err =0 , rc, block; +int need_datasync =0 ; +__le32 disksize;uid_t i_uid;gid_t i_gid;
@@ -3113,7 +3115,11 @@ again: raw_inode->i_gid_high =0 ; } raw_inode->i_links_count =cpu_to_le16 (inode->i_nlink); - raw_inode->i_size =cpu_to_le32 (ei->i_disksize); + disksize =cpu_to_le32 (ei->i_disksize); +if (disksize != raw_inode->i_size) { + need_datasync =1 ; + raw_inode->i_size = disksize; + } raw_inode->i_atime =cpu_to_le32 (inode->i_atime.tv_sec); raw_inode->i_ctime =cpu_to_le32 (inode->i_ctime.tv_sec); raw_inode->i_mtime =cpu_to_le32 (inode->i_mtime.tv_sec);
@@ -3129,8 +3135,11 @@ again:if (!S_ISREG (inode->i_mode)) { raw_inode->i_dir_acl =cpu_to_le32 (ei->i_dir_acl); } else { - raw_inode->i_size_high = - cpu_to_le32(ei->i_disksize >> 32); + disksize = cpu_to_le32(ei->i_disksize >> 32); + if (disksize != raw_inode->i_size_high) { + raw_inode->i_size_high = disksize; + need_datasync = 1; + } if (ei->i_disksize > 0x7fffffffULL) { struct super_block *sb = inode->i_sb; if (!EXT3_HAS_RO_COMPAT_FEATURE(sb,
@@ -3183,6 +3192,8 @@ again:ext3_clear_inode_state (inode,EXT3_STATE_NEW );atomic_set (&ei->i_sync_tid, handle->h_transaction->t_tid); +if (need_datasync) +atomic_set (&ei->i_datasync_tid, handle->h_transaction->t_tid); out_brelse:brelse (bh);ext3_std_error (inode->i_sb, err);
fs/fuse/dev.c +1 -0
@@ -1576,6 +1576,7 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode, req->pages[req->num_pages] = page; req->num_pages++; + offset =0 ; num -= this_num; total_len += this_num; index++;
fs/jbd/journal.c +5 -0
@@ -1113,6 +1113,11 @@ static void mark_journal_empty(journal_t *journal)BUG_ON (!mutex_is_locked (&journal->j_checkpoint_mutex));spin_lock (&journal->j_state_lock); +/* Is it already empty? */ +if (sb->s_start ==0 ) { +spin_unlock (&journal->j_state_lock); +return ; + }jbd_debug (1 ,"JBD: Marking journal as empty (seq %d)\n" , journal->j_tail_sequence);
fs/nfs/idmap.c +44 -18
135 lines not on this page · raw message
fs/nfs/nfs3proc.c +1 -1
@@ -69,7 +69,7 @@ do_proc_get_root(struct rpc_clnt *client, struct nfs_fh *fhandle,nfs_fattr_init (info->fattr); status =rpc_call_sync (client, &msg,0 );dprintk ("%s: reply fsinfo: %d\n" , __func__, status); -if (!(info->fattr->valid &NFS_ATTR_FATTR )) { +if (status ==0 && !(info->fattr->valid &NFS_ATTR_FATTR )) { msg.rpc_proc = &nfs3_procedures[NFS3PROC_GETATTR ]; msg.rpc_resp = info->fattr; status =rpc_call_sync (client, &msg,0 );
fs/nfs/nfs4proc.c +58 -7
96 lines not on this page · raw message
fs/nfs/pnfs.c +1 -38
@@ -583,9 +583,6 @@ send_layoutget(struct pnfs_layout_hdr *lo,struct nfs_server *server =NFS_SERVER (ino);struct nfs4_layoutget *lgp;struct pnfs_layout_segment *lseg =NULL ; -struct page **pages =NULL ; -int i; -u32 max_resp_sz, max_pages;dprintk ("--> %s\n" , __func__);
@@ -594,20 +591,6 @@ send_layoutget(struct pnfs_layout_hdr *lo,if (lgp ==NULL )return NULL ; -/* allocate pages for xdr post processing */ - max_resp_sz = server->nfs_client->cl_session->fc_attrs.max_resp_sz; - max_pages =nfs_page_array_len (0 , max_resp_sz); - - pages =kcalloc (max_pages,sizeof (struct page *), gfp_flags); -if (!pages) - goto out_err_free; - -for (i =0 ; i < max_pages; i++) { - pages[i] =alloc_page (gfp_flags); -if (!pages[i]) - goto out_err_free; - } - lgp->args.minlength =PAGE_CACHE_SIZE ;if (lgp->args.minlength > range->length) lgp->args.minlength = range->length;
@@ -616,39 +599,19 @@ send_layoutget(struct pnfs_layout_hdr *lo, lgp->args.type = server->pnfs_curr_ld->id; lgp->args.inode = ino; lgp->args.ctx =get_nfs_open_context (ctx); - lgp->args.layout.pages = pages; - lgp->args.layout.pglen = max_pages *PAGE_SIZE ; lgp->lsegpp = &lseg; lgp->gfp_flags = gfp_flags;/* Synchronously retrieve layout information from server and * store in lseg. */ -nfs4_proc_layoutget (lgp); +nfs4_proc_layoutget (lgp, gfp_flags);if (!lseg) {/* remember that LAYOUTGET failed and suspend trying */ set_bit (lo_fail_bit (range->iomode), &lo->plh_flags); } -/* free xdr pages */ -for (i =0 ; i < max_pages; i++) -__free_page (pages[i]); -kfree (pages); -return lseg; - -out_err_free: -/* free any allocated xdr pages, lgp as it's not used */ -if (pages) { -for (i =0 ; i < max_pages; i++) { -if (!pages[i]) -break ; -__free_page (pages[i]); - } -kfree (pages); - } -kfree (lgp); -return NULL ; }/* Initiates a LAYOUTRETURN(FILE) */
fs/nfs/pnfs.h +1 -1
@@ -171,7 +171,7 @@ extern int nfs4_proc_getdevicelist(struct nfs_server *server, struct pnfs_devicelist *devlist);extern int nfs4_proc_getdeviceinfo (struct nfs_server *server,struct pnfs_device *dev); -extern int nfs4_proc_layoutget (struct nfs4_layoutget *lgp); +extern int nfs4_proc_layoutget (struct nfs4_layoutget *lgp,gfp_t gfp_flags);extern int nfs4_proc_layoutreturn (struct nfs4_layoutreturn *lrp);/* pnfs.c */
fs/nfs/super.c +2 -0
@@ -2961,4 +2961,6 @@ static struct dentry *nfs4_referral_mount(struct file_system_type *fs_type, return res; } +MODULE_ALIAS ("nfs4" ); +#endif /* CONFIG_NFS_V4 */
fs/nfs/write.c +12 -3
@@ -1806,19 +1806,19 @@ int __init nfs_init_writepagecache(void) nfs_wdata_mempool =mempool_create_slab_pool (MIN_POOL_WRITE , nfs_wdata_cachep);if (nfs_wdata_mempool ==NULL ) -return -ENOMEM ; + goto out_destroy_write_cache; nfs_cdata_cachep =kmem_cache_create ("nfs_commit_data" ,sizeof (struct nfs_commit_data ),0 ,SLAB_HWCACHE_ALIGN ,NULL );if (nfs_cdata_cachep ==NULL ) -return -ENOMEM ; + goto out_destroy_write_mempool; nfs_commit_mempool =mempool_create_slab_pool (MIN_POOL_COMMIT , nfs_wdata_cachep);if (nfs_commit_mempool ==NULL ) -return -ENOMEM ; + goto out_destroy_commit_cache;/* * NFS congestion size, scale with available memory.
@@ -1841,11 +1841,20 @@ int __init nfs_init_writepagecache(void) nfs_congestion_kb =256 *1024 ;return 0 ; + +out_destroy_commit_cache: +kmem_cache_destroy (nfs_cdata_cachep); +out_destroy_write_mempool: +mempool_destroy (nfs_wdata_mempool); +out_destroy_write_cache: +kmem_cache_destroy (nfs_wdata_cachep); +return -ENOMEM ; }void nfs_destroy_writepagecache (void ) {mempool_destroy (nfs_commit_mempool); +kmem_cache_destroy (nfs_cdata_cachep);mempool_destroy (nfs_wdata_mempool);kmem_cache_destroy (nfs_wdata_cachep); }
fs/nfsd/nfs4callback.c +2 -2
@@ -651,12 +651,12 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *cif (clp->cl_minorversion ==0 ) {if (!clp->cl_cred.cr_principal && - (clp->cl_flavor >=RPC_AUTH_GSS_KRB5 )) + (clp->cl_cred.cr_flavor >=RPC_AUTH_GSS_KRB5 ))return -EINVAL ; args.client_name = clp->cl_cred.cr_principal; args.prognumber = conn->cb_prog, args.protocol =XPRT_TRANSPORT_TCP ; - args.authflavor = clp->cl_flavor; + args.authflavor = clp->cl_cred.cr_flavor; clp->cl_cb_ident = conn->cb_ident; }else {if (!conn->cb_xprt)
fs/nfsd/state.h +0 -1
@@ -231,7 +231,6 @@ struct nfs4_client {nfs4_verifier cl_verifier;/* generated by client */ time_t cl_time;/* time of last lease renewal */ struct sockaddr_storage cl_addr;/* client ipaddress */ -u32 cl_flavor;/* setclientid pseudoflavor */ struct svc_cred cl_cred;/* setclientid principal */ clientid_t cl_clientid;/* generated by server */ nfs4_verifier cl_confirm;/* generated by server */
fs/open.c +4 -3
@@ -930,9 +930,10 @@ static inline int build_open_flags(int flags, umode_t mode, struct open_flags *oint lookup_flags =0 ;int acc_mode; -if (!(flags &O_CREAT )) - mode =0 ; - op->mode = mode; +if (flags &O_CREAT ) + op->mode = (mode &S_IALLUGO ) |S_IFREG ; +else + op->mode =0 ;/* Must never be set by userspace */ flags &= ~FMODE_NONOTIFY ;
fs/ubifs/debug.h +1 -1
@@ -162,7 +162,7 @@ struct ubifs_global_debug_info {#define ubifs_dbg_msg (type, fmt, ...) \ pr_debug("UBIFS DBG " type ": " fmt "\n", ##__VA_ARGS__) -#define DBG_KEY_BUF_LEN 32 +#define DBG_KEY_BUF_LEN 48#define ubifs_dbg_msg_key (type, key, fmt, ...) do { \ char __tmp_key_buf[DBG_KEY_BUF_LEN]; \ pr_debug("UBIFS DBG " type ": " fmt "%s\n", ##__VA_ARGS__, \
fs/ubifs/lpt.c +4 -1
@@ -1749,7 +1749,10 @@ int ubifs_lpt_init(struct ubifs_info *c, int rd, int wr)return 0 ; out_err: -ubifs_lpt_free (c,0 ); +if (wr) +ubifs_lpt_free (c,1 ); +if (rd) +ubifs_lpt_free (c,0 );return err; }
fs/udf/file.c +29 -6
@@ -39,20 +39,24 @@#include "udf_i.h" #include "udf_sb.h" -static int udf_adinicb_readpage (struct file *file,struct page *page) +static void __udf_adinicb_readpage (struct page *page) {struct inode *inode = page->mapping->host;char *kaddr;struct udf_inode_info *iinfo =UDF_I (inode); -BUG_ON (!PageLocked (page)); - kaddr =kmap (page); -memset (kaddr,0 ,PAGE_CACHE_SIZE );memcpy (kaddr, iinfo->i_ext.i_data + iinfo->i_lenEAttr, inode->i_size); +memset (kaddr + inode->i_size,0 ,PAGE_CACHE_SIZE - inode->i_size);flush_dcache_page (page);SetPageUptodate (page);kunmap (page); +} + +static int udf_adinicb_readpage (struct file *file,struct page *page) +{ +BUG_ON (!PageLocked (page)); +__udf_adinicb_readpage (page);unlock_page (page);return 0 ;
@@ -77,6 +81,25 @@ static int udf_adinicb_writepage(struct page *page,return 0 ; } +static int udf_adinicb_write_begin (struct file *file, +struct address_space *mapping,loff_t pos, +unsigned len,unsigned flags,struct page **pagep, +void **fsdata) +{ +struct page *page; + +if (WARN_ON_ONCE (pos >=PAGE_CACHE_SIZE )) +return -EIO ; + page =grab_cache_page_write_begin (mapping,0 , flags); +if (!page) +return -ENOMEM ; + *pagep = page; + +if (!PageUptodate (page) && len !=PAGE_CACHE_SIZE ) +__udf_adinicb_readpage (page); +return 0 ; +} + static int udf_adinicb_write_end(struct file *file, struct address_space *mapping, loff_t pos, unsigned len, unsigned copied,
@@ -98,8 +121,8 @@ static int udf_adinicb_write_end(struct file *file,const struct address_space_operations udf_adinicb_aops = { .readpage = udf_adinicb_readpage, .writepage = udf_adinicb_writepage, - .write_begin = simple_write_begin, - .write_end = udf_adinicb_write_end, + .write_begin = udf_adinicb_write_begin, + .write_end = udf_adinicb_write_end, }; static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
kernel/audit_tree.c +5 -6
@@ -250,7 +250,6 @@ static void untag_chunk(struct node *p)spin_unlock (&hash_lock);spin_unlock (&entry->lock);fsnotify_destroy_mark (entry); -fsnotify_put_mark (entry); goto out; }
@@ -259,7 +258,7 @@ static void untag_chunk(struct node *p)fsnotify_duplicate_mark (&new->mark, entry);if (fsnotify_add_mark (&new->mark, new->mark.group, new->mark.i.inode,NULL ,1 )) { -free_chunk (new); +fsnotify_put_mark (&new->mark); goto Fallback; }
@@ -293,7 +292,6 @@ static void untag_chunk(struct node *p)spin_unlock (&hash_lock);spin_unlock (&entry->lock);fsnotify_destroy_mark (entry); -fsnotify_put_mark (entry); goto out; Fallback:
@@ -322,7 +320,7 @@ static int create_chunk(struct inode *inode, struct audit_tree *tree) entry = &chunk->mark;if (fsnotify_add_mark (entry, audit_tree_group, inode,NULL ,0 )) { -free_chunk (chunk); +fsnotify_put_mark (entry);return -ENOSPC ; }
@@ -332,6 +330,7 @@ static int create_chunk(struct inode *inode, struct audit_tree *tree)spin_unlock (&hash_lock); chunk->dead =1 ;spin_unlock (&entry->lock); +fsnotify_get_mark (entry);fsnotify_destroy_mark (entry);fsnotify_put_mark (entry);return 0 ;
@@ -396,7 +395,7 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)fsnotify_duplicate_mark (chunk_entry, old_entry);if (fsnotify_add_mark (chunk_entry, chunk_entry->group, chunk_entry->i.inode,NULL ,1 )) {spin_unlock (&old_entry->lock); -free_chunk (chunk); +fsnotify_put_mark (chunk_entry);fsnotify_put_mark (old_entry);return -ENOSPC ; }
@@ -412,6 +411,7 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)spin_unlock (&chunk_entry->lock);spin_unlock (&old_entry->lock); +fsnotify_get_mark (chunk_entry);fsnotify_destroy_mark (chunk_entry);fsnotify_put_mark (chunk_entry);
@@ -445,7 +445,6 @@ static int tag_chunk(struct inode *inode, struct audit_tree *tree)spin_unlock (&old_entry->lock);fsnotify_destroy_mark (old_entry);fsnotify_put_mark (old_entry);/* pair to fsnotify_find mark_entry */ -fsnotify_put_mark (old_entry);/* and kill it */ return 0 ; }
kernel/fork.c +2 -2
@@ -459,8 +459,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)if (retval) goto out; -if (file &&uprobe_mmap (tmp)) - goto out; +if (file) +uprobe_mmap (tmp); }/* a new mm has just been created */ arch_dup_mmap (oldmm, mm);
kernel/sched/core.c +21 -14
@@ -3142,6 +3142,20 @@ void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st)# define nsecs_to_cputime (__nsecs) nsecs_to_jiffies(__nsecs)#endif +static cputime_t scale_utime (cputime_t utime,cputime_t rtime,cputime_t total) +{ +u64 temp = (__force u64 ) rtime; + + temp *= (__force u64 ) utime; + +if (sizeof (cputime_t) ==4 ) + temp =div_u64 (temp, (__force u32 ) total); +else + temp =div64_u64 (temp, (__force u64 ) total); + +return (__force cputime_t ) temp; +} +void task_times (struct task_struct *p,cputime_t *ut,cputime_t *st) {cputime_t rtime, utime = p->utime, total = utime + p->stime;
@@ -3151,13 +3165,9 @@ void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st)*/ rtime =nsecs_to_cputime (p->se.sum_exec_runtime); -if (total) { -u64 temp = (__force u64 ) rtime; - - temp *= (__force u64 ) utime; -do_div (temp, (__force u32 ) total); - utime = (__force cputime_t ) temp; - }else +if (total) + utime =scale_utime (utime, rtime, total); +else utime = rtime;/*
@@ -3184,13 +3194,9 @@ void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st) total = cputime.utime + cputime.stime; rtime =nsecs_to_cputime (cputime.sum_exec_runtime); -if (total) { -u64 temp = (__force u64 ) rtime; - - temp *= (__force u64 ) cputime.utime; -do_div (temp, (__force u32 ) total); - utime = (__force cputime_t ) temp; - }else +if (total) + utime =scale_utime (cputime.utime, rtime, total); +else utime = rtime; sig->prev_utime =max (sig->prev_utime, utime);
@@ -7179,6 +7185,7 @@ int in_sched_functions(unsigned long addr)#ifdef CONFIG_CGROUP_SCHED struct task_group root_task_group; +LIST_HEAD (task_groups);#endif DECLARE_PER_CPU (cpumask_var_t, load_balance_tmpmask);
kernel/sched/sched.h +1 -1
@@ -80,7 +80,7 @@ extern struct mutex sched_domains_mutex;struct cfs_rq ;struct rt_rq ; -static LIST_HEAD (task_groups); +extern struct list_head task_groups;struct cfs_bandwidth {#ifdef CONFIG_CFS_BANDWIDTH
mm/mempolicy.c +1 -1
@@ -2556,7 +2556,7 @@ int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol, int no_context)break ;default : -BUG (); +return -EINVAL ; } l =strlen (policy_modes[mode]);
mm/mmap.c +2 -3
@@ -1355,9 +1355,8 @@ out: }else if ((flags &MAP_POPULATE ) && !(flags &MAP_NONBLOCK ))make_pages_present (addr, addr + len); -if (file &&uprobe_mmap (vma)) -/* matching probes but cannot insert */ - goto unmap_and_free_vma; +if (file) +uprobe_mmap (vma);return addr;
net/bluetooth/hci_event.c +22 -6
@@ -1375,6 +1375,9 @@ static bool hci_resolve_next_name(struct hci_dev *hdev)return false; e =hci_inquiry_cache_lookup_resolve (hdev,BDADDR_ANY ,NAME_NEEDED ); +if (!e) +return false; +if (hci_resolve_name (hdev, e) ==0 ) { e->name_state =NAME_PENDING ;return true;
@@ -1403,12 +1406,20 @@ static void hci_check_pending_name(struct hci_dev *hdev, struct hci_conn *conn,return ; e =hci_inquiry_cache_lookup_resolve (hdev, bdaddr,NAME_PENDING ); -if (e) { +/* If the device was not found in a list of found devices names of which +* are pending. there is no need to continue resolving a next name as it +* will be done upon receiving another Remote Name Request Complete +* Event */ +if (!e) +return ; + +list_del (&e->list); +if (name) { e->name_state =NAME_KNOWN ; -list_del (&e->list); -if (name) -mgmt_remote_name (hdev, bdaddr,ACL_LINK ,0x00 , - e->data.rssi, name, name_len); +mgmt_remote_name (hdev, bdaddr,ACL_LINK ,0x00 , + e->data.rssi, name, name_len); + }else { + e->name_state =NAME_NOT_KNOWN ; }if (hci_resolve_next_name (hdev))
@@ -1772,7 +1783,12 @@ static inline void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *sif (conn->type ==ACL_LINK ) { conn->state =BT_CONFIG ;hci_conn_hold (conn); - conn->disc_timeout =HCI_DISCONN_TIMEOUT ; + +if (!conn->out && !hci_conn_ssp_enabled (conn) && + !hci_find_link_key (hdev, &ev->bdaddr)) + conn->disc_timeout =HCI_PAIRING_TIMEOUT ; +else + conn->disc_timeout =HCI_DISCONN_TIMEOUT ; }else conn->state =BT_CONNECTED ;
net/bluetooth/l2cap_core.c +1 -0
@@ -1163,6 +1163,7 @@ static void l2cap_le_conn_ready(struct l2cap_conn *conn) sk = chan->sk;hci_conn_hold (conn->hcon); + conn->hcon->disc_timeout =HCI_DISCONN_TIMEOUT ;bacpy (&bt_sk (sk)->src, conn->src);bacpy (&bt_sk (sk)->dst, conn->dst);
net/dccp/ccid.h +2 -2
@@ -246,7 +246,7 @@ static inline int ccid_hc_rx_getsockopt(struct ccid *ccid, struct sock *sk, u32 __user *optval, int __user *optlen) {int rc = -ENOPROTOOPT ; -if (ccid->ccid_ops->ccid_hc_rx_getsockopt !=NULL ) +if (ccid !=NULL && ccid->ccid_ops->ccid_hc_rx_getsockopt !=NULL ) rc = ccid->ccid_ops->ccid_hc_rx_getsockopt (sk, optname, len, optval, optlen);return rc;
@@ -257,7 +257,7 @@ static inline int ccid_hc_tx_getsockopt(struct ccid *ccid, struct sock *sk, u32 __user *optval, int __user *optlen) {int rc = -ENOPROTOOPT ; -if (ccid->ccid_ops->ccid_hc_tx_getsockopt !=NULL ) +if (ccid !=NULL && ccid->ccid_ops->ccid_hc_tx_getsockopt !=NULL ) rc = ccid->ccid_ops->ccid_hc_tx_getsockopt (sk, optname, len, optval, optlen);return rc;
net/socket.c +2 -2
@@ -2605,7 +2605,7 @@ static int do_siocgstamp(struct net *net, struct socket *sock, err =sock_do_ioctl (net, sock, cmd, (unsigned long )&ktv);set_fs (old_fs);if (!err) - err =compat_put_timeval (up, &ktv); + err =compat_put_timeval (&ktv, up);return err; }
@@ -2621,7 +2621,7 @@ static int do_siocgstampns(struct net *net, struct socket *sock, err =sock_do_ioctl (net, sock, cmd, (unsigned long )&kts);set_fs (old_fs);if (!err) - err =compat_put_timespec (up, &kts); + err =compat_put_timespec (&kts, up);return err; }
net/sunrpc/svc_xprt.c +4 -6
@@ -316,7 +316,6 @@ static bool svc_xprt_has_something_to_do(struct svc_xprt *xprt)*/ void svc_xprt_enqueue (struct svc_xprt *xprt) { -struct svc_serv *serv = xprt->xpt_server;struct svc_pool *pool;struct svc_rqst *rqstp;int cpu;
@@ -362,8 +361,6 @@ void svc_xprt_enqueue(struct svc_xprt *xprt) rqstp, rqstp->rq_xprt); rqstp->rq_xprt = xprt;svc_xprt_get (xprt); - rqstp->rq_reserved = serv->sv_max_mesg; -atomic_add (rqstp->rq_reserved, &xprt->xpt_reserved); pool->sp_stats.threads_woken++;wake_up (&rqstp->rq_wait); }else {
@@ -640,8 +637,6 @@ int svc_recv(struct svc_rqst *rqstp, long timeout)if (xprt) { rqstp->rq_xprt = xprt;svc_xprt_get (xprt); - rqstp->rq_reserved = serv->sv_max_mesg; -atomic_add (rqstp->rq_reserved, &xprt->xpt_reserved);/* As there is a shortage of threads and this request * had to be queued, don't allow the thread to wait so
@@ -738,6 +733,8 @@ int svc_recv(struct svc_rqst *rqstp, long timeout)else len = xprt->xpt_ops->xpo_recvfrom (rqstp);dprintk ("svc: got len=%d\n" , len); + rqstp->rq_reserved = serv->sv_max_mesg; +atomic_add (rqstp->rq_reserved, &xprt->xpt_reserved); }svc_xprt_received (xprt);
@@ -794,7 +791,8 @@ int svc_send(struct svc_rqst *rqstp)/* Grab mutex to serialize outgoing data. */ mutex_lock (&xprt->xpt_mutex); -if (test_bit (XPT_DEAD , &xprt->xpt_flags)) +if (test_bit (XPT_DEAD , &xprt->xpt_flags) + ||test_bit (XPT_CLOSE , &xprt->xpt_flags)) len = -ENOTCONN ;else len = xprt->xpt_ops->xpo_sendto (rqstp);
net/sunrpc/svcsock.c +1 -1
@@ -1129,9 +1129,9 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp)if (len >=0 ) svsk->sk_tcplen += len;if (len != want) { +svc_tcp_save_pages (svsk, rqstp);if (len <0 && len != -EAGAIN ) goto err_other; -svc_tcp_save_pages (svsk, rqstp);dprintk ("svc: incomplete TCP record (%d of %d)\n" , svsk->sk_tcplen, svsk->sk_reclen); goto err_noclose;
sound/pci/hda/hda_codec.c +2 -0
@@ -4422,6 +4422,8 @@ static void __snd_hda_power_up(struct hda_codec *codec, bool wait_power_down)* then there is no need to go through power up here. */ if (codec->power_on) { +if (codec->power_transition <0 ) + codec->power_transition =0 ;spin_unlock (&codec->power_lock);return ; }
sound/pci/hda/hda_proc.c +1 -1
@@ -412,7 +412,7 @@ static void print_digital_conv(struct snd_info_buffer *buffer,if (digi1 &AC_DIG1_EMPHASIS )snd_iprintf (buffer," Preemphasis" );if (digi1 &AC_DIG1_COPYRIGHT ) -snd_iprintf (buffer," Copyright" ); +snd_iprintf (buffer," Non-Copyright" );if (digi1 &AC_DIG1_NONAUDIO )snd_iprintf (buffer," Non-Audio" );if (digi1 &AC_DIG1_PROFESSIONAL )
sound/pci/hda/patch_ca0132.c +8 -0
@@ -275,6 +275,10 @@ static int _add_switch(struct hda_codec *codec, hda_nid_t nid, const char *pfx,int type = dir ?HDA_INPUT :HDA_OUTPUT ;struct snd_kcontrol_new knew =HDA_CODEC_MUTE_MONO (namestr, nid, chan,0 , type); +if ((query_amp_caps (codec, nid, type) &AC_AMPCAP_MUTE ) ==0 ) { +snd_printdd ("Skipping '%s %s Switch' (no mute on node 0x%x)\n" , pfx, dirstr[dir], nid); +return 0 ; + }sprintf (namestr,"%s %s Switch" , pfx, dirstr[dir]);return snd_hda_ctl_add (codec, nid,snd_ctl_new1 (&knew, codec)); }
@@ -286,6 +290,10 @@ static int _add_volume(struct hda_codec *codec, hda_nid_t nid, const char *pfx,int type = dir ?HDA_INPUT :HDA_OUTPUT ;struct snd_kcontrol_new knew =HDA_CODEC_VOLUME_MONO (namestr, nid, chan,0 , type); +if ((query_amp_caps (codec, nid, type) &AC_AMPCAP_NUM_STEPS ) ==0 ) { +snd_printdd ("Skipping '%s %s Volume' (no amp on node 0x%x)\n" , pfx, dirstr[dir], nid); +return 0 ; + }sprintf (namestr,"%s %s Volume" , pfx, dirstr[dir]);return snd_hda_ctl_add (codec, nid,snd_ctl_new1 (&knew, codec)); }
sound/soc/codecs/wm9712.c +17 -2
@@ -272,7 +272,7 @@ SOC_DAPM_ENUM("Route", wm9712_enum[9]);/* Mic select */ static const struct snd_kcontrol_new wm9712_mic_src_controls = -SOC_DAPM_ENUM ("Route" , wm9712_enum[7 ]); +SOC_DAPM_ENUM ("Mic Source Select" , wm9712_enum[7 ]);/* diff select */ static const struct snd_kcontrol_new wm9712_diff_sel_controls =
@@ -291,7 +291,9 @@ SND_SOC_DAPM_MUX("Left Capture Select", SND_SOC_NOPM, 0, 0, &wm9712_capture_selectl_controls),SND_SOC_DAPM_MUX ("Right Capture Select" ,SND_SOC_NOPM ,0 ,0 , &wm9712_capture_selectr_controls), -SND_SOC_DAPM_MUX ("Mic Select Source" ,SND_SOC_NOPM ,0 ,0 , +SND_SOC_DAPM_MUX ("Left Mic Select Source" ,SND_SOC_NOPM ,0 ,0 , + &wm9712_mic_src_controls), +SND_SOC_DAPM_MUX ("Right Mic Select Source" ,SND_SOC_NOPM ,0 ,0 , &wm9712_mic_src_controls),SND_SOC_DAPM_MUX ("Differential Source" ,SND_SOC_NOPM ,0 ,0 , &wm9712_diff_sel_controls),
@@ -319,6 +321,7 @@ SND_SOC_DAPM_PGA("Out 3 PGA", AC97_INT_PAGING, 5, 1, NULL, 0),SND_SOC_DAPM_PGA ("Line PGA" ,AC97_INT_PAGING ,2 ,1 ,NULL ,0 ),SND_SOC_DAPM_PGA ("Phone PGA" ,AC97_INT_PAGING ,1 ,1 ,NULL ,0 ),SND_SOC_DAPM_PGA ("Mic PGA" ,AC97_INT_PAGING ,0 ,1 ,NULL ,0 ), +SND_SOC_DAPM_PGA ("Differential Mic" ,SND_SOC_NOPM ,0 ,0 ,NULL ,0 ),SND_SOC_DAPM_MICBIAS ("Mic Bias" ,AC97_INT_PAGING ,10 ,1 ),SND_SOC_DAPM_OUTPUT ("MONOOUT" ), SND_SOC_DAPM_OUTPUT("HPOUTL"),
@@ -379,6 +382,18 @@ static const struct snd_soc_dapm_route wm9712_audio_map[] = { {"Mic PGA", NULL, "MIC1"}, {"Mic PGA", NULL, "MIC2"}, +/* microphones */ + {"Differential Mic", NULL, "MIC1"}, + {"Differential Mic", NULL, "MIC2"}, + {"Left Mic Select Source", "Mic 1", "MIC1"}, + {"Left Mic Select Source", "Mic 2", "MIC2"}, + {"Left Mic Select Source", "Stereo", "MIC1"}, + {"Left Mic Select Source", "Differential", "Differential Mic"}, + {"Right Mic Select Source", "Mic 1", "MIC1"}, + {"Right Mic Select Source", "Mic 2", "MIC2"}, + {"Right Mic Select Source", "Stereo", "MIC2"}, + {"Right Mic Select Source", "Differential", "Differential Mic"}, +/* left capture selector */ {"Left Capture Select", "Mic", "MIC1"}, {"Left Capture Select", "Speaker Mixer", "Speaker Mixer"},
sound/soc/omap/mcbsp.c +1 -1
@@ -745,7 +745,7 @@ int omap_mcbsp_6pin_src_mux(struct omap_mcbsp *mcbsp, u8 mux) {const char *signal, *src; -if (mcbsp->pdata->mux_signal) +if (!mcbsp->pdata->mux_signal)return -EINVAL ;switch (mux) {
sound/usb/card.c +2 -2
@@ -553,7 +553,7 @@ static void snd_usb_audio_disconnect(struct usb_device *dev, struct snd_usb_audio *chip) {struct snd_card *card; -struct list_head *p; +struct list_head *p, *n;if (chip == (void *)-1L )return ;
@@ -570,7 +570,7 @@ static void snd_usb_audio_disconnect(struct usb_device *dev,snd_usb_stream_disconnect (p); }/* release the endpoint resources */ -list_for_each (p, &chip->ep_list) { +list_for_each_safe (p, n, &chip->ep_list) {snd_usb_endpoint_free (p); }/* release the midi resources */
sound/usb/endpoint.c +8 -16
@@ -141,7 +141,7 @@ int snd_usb_endpoint_implict_feedback_sink(struct snd_usb_endpoint *ep)* * For implicit feedback, next_packet_size() is unused. */ -static int next_packet_size (struct snd_usb_endpoint *ep) +int snd_usb_endpoint_next_packet_size (struct snd_usb_endpoint *ep) {unsigned long flags;int ret;
@@ -177,15 +177,6 @@ static void retire_inbound_urb(struct snd_usb_endpoint *ep, ep->retire_data_urb (ep->data_subs, urb); } -static void prepare_outbound_urb_sizes (struct snd_usb_endpoint *ep, -struct snd_urb_ctx *ctx) -{ -int i; - -for (i =0 ; i < ctx->packets; ++i) - ctx->packet_size[i] =next_packet_size (ep); -} -/* * Prepare a PLAYBACK urb for submission to the bus. */
@@ -370,7 +361,6 @@ static void snd_complete_urb(struct urb *urb) goto exit_clear; } -prepare_outbound_urb_sizes (ep, ctx);prepare_outbound_urb (ep, ctx); }else {retire_inbound_urb (ep, ctx);
@@ -799,7 +789,9 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep,/** * snd_usb_endpoint_start: start an snd_usb_endpoint * -* @ep: the endpoint to start +* @ep: the endpoint to start +* @can_sleep: flag indicating whether the operation is executed in +* non-atomic context * * A call to this function will increment the use count of the endpoint. * In case it is not already running, the URBs for this endpoint will be
@@ -809,7 +801,7 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep,* * Returns an error if the URB submission failed, 0 in all other cases. */ -int snd_usb_endpoint_start (struct snd_usb_endpoint *ep) +int snd_usb_endpoint_start (struct snd_usb_endpoint *ep,int can_sleep) {int err;unsigned int i;
@@ -822,8 +814,9 @@ int snd_usb_endpoint_start(struct snd_usb_endpoint *ep)return 0 ;/* just to be sure */ -deactivate_urbs (ep,0 ,1 ); -wait_clear_urbs (ep); +deactivate_urbs (ep,0 , can_sleep); +if (can_sleep) +wait_clear_urbs (ep); ep->active_mask =0 ; ep->unlink_mask =0 ;
@@ -854,7 +847,6 @@ int snd_usb_endpoint_start(struct snd_usb_endpoint *ep) goto __error;if (usb_pipeout (ep->pipe)) { -prepare_outbound_urb_sizes (ep, urb->context);prepare_outbound_urb (ep, urb->context); }else {prepare_inbound_urb (ep, urb->context);
sound/usb/endpoint.h +2 -1
@@ -13,7 +13,7 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep,struct audioformat *fmt, struct snd_usb_endpoint *sync_ep); -int snd_usb_endpoint_start (struct snd_usb_endpoint *ep); +int snd_usb_endpoint_start (struct snd_usb_endpoint *ep,int can_sleep);void snd_usb_endpoint_stop (struct snd_usb_endpoint *ep,int force,int can_sleep,int wait);int snd_usb_endpoint_activate (struct snd_usb_endpoint *ep);
@@ -21,6 +21,7 @@ int snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep);void snd_usb_endpoint_free (struct list_head *head);int snd_usb_endpoint_implict_feedback_sink (struct snd_usb_endpoint *ep); +int snd_usb_endpoint_next_packet_size (struct snd_usb_endpoint *ep); void snd_usb_handle_sync_urb(struct snd_usb_endpoint *ep, struct snd_usb_endpoint *sender,
sound/usb/pcm.c +52 -9
122 lines not on this page · raw message
Linux 3.5.4 (was: Linux 3.5.3)
In reply to Greg KHjust a quick fix to $SUBJECT :-)
Quoted 376 lines · Greg KH
I'm announcing the release of the 3.5.4 kernel.
All users of the 3.5 kernel series must upgrade.
The updated 3.5.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.gitlinux-3.5.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=summarythanks,
greg k-h
------------
Documentation/i2c/busses/i2c-i801 | 1 Makefile | 2 arch/alpha/include/asm/fpu.h | 2 arch/alpha/include/asm/socket.h | 2 arch/arm/Kconfig | 1 arch/arm/include/asm/pgtable.h | 40 +++++----- arch/arm/mach-imx/Makefile | 10 +- arch/arm/mach-imx/head-v7.S | 106 ----------------------------- arch/arm/mach-imx/headsmp.S | 106 +++++++++++++++++++++++++++++ arch/arm/mach-imx/hotplug.c | 23 ------ arch/arm/mach-s3c24xx/include/mach/dma.h | 3 arch/arm/mm/flush.c | 2 arch/arm/mm/tlb-v7.S | 6 - arch/arm/plat-omap/dmtimer.c | 2 arch/arm/plat-s3c24xx/dma.c | 2 arch/arm/vfp/vfpmodule.c | 2 arch/mips/pci/pci-ar724x.c | 22 ++++++ arch/parisc/include/asm/atomic.h | 4 - arch/powerpc/kernel/asm-offsets.c | 1 arch/powerpc/kernel/dbell.c | 2 arch/powerpc/kernel/entry_64.S | 23 ++++-- arch/powerpc/kernel/process.c | 12 --- arch/powerpc/kernel/smp.c | 11 ++- arch/powerpc/kernel/sysfs.c | 10 ++ arch/powerpc/kernel/traps.c | 3 arch/powerpc/sysdev/xics/icp-hv.c | 6 + arch/x86/kernel/microcode_amd.c | 7 + arch/x86/mm/hugetlbpage.c | 21 ++++- arch/x86/syscalls/syscall_64.tbl | 6 + arch/x86/xen/p2m.c | 95 +++++++++++++++++++++++++ arch/x86/xen/setup.c | 9 ++ drivers/acpi/acpica/tbxface.c | 1 drivers/block/cciss_scsi.c | 11 --- drivers/gpu/drm/gma500/psb_intel_display.c | 3 drivers/gpu/drm/radeon/radeon_object.c | 3 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 6 + drivers/hid/usbhid/hid-quirks.c | 1 drivers/hwmon/asus_atk0110.c | 6 + drivers/i2c/busses/Kconfig | 6 + drivers/i2c/busses/Makefile | 5 - drivers/i2c/busses/i2c-designware-core.c | 11 +++ drivers/i2c/busses/i2c-i801.c | 3 drivers/input/serio/i8042-x86ia64io.h | 14 +++ drivers/media/dvb/siano/smsusb.c | 2 drivers/media/video/gspca/jl2005bcd.c | 2 drivers/media/video/gspca/spca506.c | 2 drivers/media/video/uvc/uvc_queue.c | 1 drivers/mtd/ubi/vtbl.c | 4 - drivers/net/ethernet/intel/e1000e/e1000.h | 1 drivers/net/ethernet/intel/e1000e/netdev.c | 48 ++++++------- drivers/net/usb/usbnet.c | 2 drivers/net/wireless/ath/ath9k/pci.c | 1 drivers/net/wireless/ath/ath9k/recv.c | 2 drivers/net/wireless/p54/p54usb.c | 2 drivers/net/wireless/rtl818x/rtl8187/dev.c | 2 drivers/pci/pci-driver.c | 7 + drivers/rapidio/devices/tsi721.c | 12 +++ drivers/regulator/twl-regulator.c | 4 - drivers/scsi/megaraid/megaraid_sas_base.c | 3 drivers/scsi/mpt2sas/mpt2sas_base.c | 13 ++- drivers/scsi/scsi_error.c | 10 ++ drivers/scsi/scsi_lib.c | 5 + drivers/scsi/scsi_scan.c | 10 ++ drivers/staging/vt6656/main_usb.c | 2 drivers/staging/winbond/wbusb.c | 2 drivers/target/target_core_transport.c | 4 - drivers/usb/class/cdc-acm.c | 3 drivers/usb/misc/emi62.c | 2 drivers/video/omap2/omapfb/omapfb-main.c | 2 drivers/xen/swiotlb-xen.c | 2 drivers/xen/xen-pciback/pci_stub.c | 8 +- fs/btrfs/extent_io.c | 17 ---- fs/btrfs/volumes.c | 22 ------ fs/btrfs/volumes.h | 2 fs/buffer.c | 66 ++++++++---------- fs/compat.c | 10 ++ fs/ext3/inode.c | 17 +++- fs/fuse/dev.c | 1 fs/jbd/journal.c | 5 + fs/nfs/idmap.c | 62 ++++++++++++---- fs/nfs/nfs3proc.c | 2 fs/nfs/nfs4proc.c | 65 +++++++++++++++-- fs/nfs/pnfs.c | 39 ---------- fs/nfs/pnfs.h | 2 fs/nfs/super.c | 2 fs/nfs/write.c | 15 +++- fs/nfsd/nfs4callback.c | 4 - fs/nfsd/state.h | 1 fs/open.c | 7 + fs/ubifs/debug.h | 2 fs/ubifs/lpt.c | 5 + fs/udf/file.c | 35 +++++++-- kernel/audit_tree.c | 11 +-- kernel/fork.c | 4 - kernel/sched/core.c | 35 +++++---- kernel/sched/sched.h | 2 mm/mempolicy.c | 2 mm/mmap.c | 5 - net/bluetooth/hci_event.c | 28 ++++++- net/bluetooth/l2cap_core.c | 1 net/dccp/ccid.h | 4 - net/socket.c | 4 - net/sunrpc/svc_xprt.c | 10 +- net/sunrpc/svcsock.c | 2 sound/pci/hda/hda_codec.c | 2 sound/pci/hda/hda_proc.c | 2 sound/pci/hda/patch_ca0132.c | 8 ++ sound/soc/codecs/wm9712.c | 19 ++++- sound/soc/omap/mcbsp.c | 2 sound/usb/card.c | 4 - sound/usb/endpoint.c | 24 ++---- sound/usb/endpoint.h | 3 sound/usb/pcm.c | 61 ++++++++++++++-- 114 files changed, 881 insertions(+), 504 deletions(-)Aaro Koskinen (1):
regulator: twl-regulator: fix up VINTANA1/VINTANA2Al Viro (1):
vfs: missed source of ->f_pos racesAlan Cox (1):
drm: stop vmgfx driver explosionAlan Stern (1):
HID: add NOGET quirk for Eaton Ellipse MAX UPSAlex Deucher (2):
Revert "drm/radeon: fix bo creation retry path"
ACPI: export symbolacpi_get_table_with_sizeAlexandre Bounine (2):
rapidio/tsi721: fix inbound doorbell interrupt handling rapidio/tsi721: fix unused variable compiler warningAndreas Herrmann (1):
x86, microcode, AMD: Fix broken ucode patch size checkAnton Blanchard (4):
powerpc: Update DSCR on all CPUs when writing sysfsdscr_default
powerpc: Keep thread.dscr and thread.dscr_inherit in sync
powerpc: Fix DSCR inheritance incopy_thread()
powerpc: Restore correct DSCR in context switchArnd Bergmann (3):
ARM: imx: build pm-imx5 code only when PM is enabled
ARM: imx: selectCPU_FREQ_TABLEwhen needed
ARM: imx: build i.MX6 functions only when neededArtem Bityutskiy (3):
UBIFS: fix crash on error path
UBIFS: fix complaints about too small debug buffer size
UBI: fix a horrible memory deallocation bugAxel Lin (1):
i2c-designware: Fix build error if CONFIG_I2C_DESIGNWARE_PLATFORM=y && CONFIG_I2C_DESIGNWARE_PCI=yBruce Allan (1):
e1000e: DoS while TSO enabled caused by link partner with small MSSBryan Schumaker (2):
NFS: Clear key construction data if the idmap upcall fails
NFS: return-ENOKEYwhen the upcall fails to map the nameDaniel Mack (4):
ALSA: snd-usb: Fix URB cancellation at stream start
ALSA: snd-usb: restore delay information
ALSA: snd-usb: fix calls tonext_packet_size
ALSA: snd-usb: fix cross-interface streaming devicesDave Airlie (1):
drm/vmwgfx: addMODULE_DEVICE_TABLEso vmwgfx loads at bootDave Jones (1):
Remove user-triggerable BUG frommpol_to_strDavid Henningsson (1):
ALSA: hda - don't create dysfunctional mixer controls for ca0132Dmitry Torokhov (1):
Input: i8042 - add Gigabyte T1005 series netbooks to noloop tableForest Bond (1):
gma500: Consider CRTC initially active.Gabor Juhos (1):
MIPS: pci-ar724x: avoid data bus error due to a missing PCIe moduleGrazvydas Ignotas (1):
OMAPFB: fix framebuffer console colorsGreg Kroah-Hartman (9):
USB: vt6656: remove __devinit* from the structusb_device_idtable
USB: emi62: remove __devinit* from the structusb_device_idtable
USB: winbond: remove __devinit* from the structusb_device_idtable
USB: spca506: remove __devinit* from the structusb_device_idtable
USB: jl2005bcd: remove __devinit* from the structusb_device_idtable
USB: p54usb: remove __devinit* from the structusb_device_idtable
USB: rtl8187: remove __devinit* from the structusb_device_idtable
USB: smsusb: remove __devinit* from the structusb_device_idtable Linux 3.5.4Heiko Stuebner (2):
ARM: S3C24XX: Add missingDMACH_DT_PROP
ARM: S3C24XX: Fixs3c2410_dma_enqueueparametersHugh Dickins (1):
block: replace__getblk_slowmisfix bygrow_dev_pagefixIdan Kedar (1):
pnfs: defer release of pages in layoutgetJ. Bruce Fields (4):
nfsd4: fix security flavor of NFSv4.0 callback
svcrpc: fixBUG()insvc_tcp_clear_pages
svcrpc: fix svc_xprt_enqueue/svc_recv busy-looping
svcrpc: sends on closed socket should stop immediatelyJames Bottomley (1):
SCSI: Fix 'Device not ready' issue on mpt2sasJames Ralston (1):
i2c-i801: Add Device IDs for Intel Lynx Point-LP PCHJan Kara (3):
jbd: don't write superblock when unmounting an ro filesystem
udf: Fix data corruption for files in ICB
ext3: Fixfdatasync()for files with onlyi_sizechangesJayakrishnan Memana (1):
uvcvideo: Reset the bytesused field when recycling an erroneous bufferJeff Layton (1):
nfs: tear down caches innfs_init_writepagecachewhen allocation failsJon Hunter (1):
ARM: OMAP2+: Fix dmtimer set source clock failureKashyap Desai (1):
SCSI:megaraid_sas: Movepoll_aen_lockinitializerKonrad Rzeszutek Wilk (4):
xen/p2m: Reuse existing P2M leafs if they are filled with 1:1 PFNs or INVALID. xen/setup: Fix one-off error when adding for-balloon PFNs to the P2M. xen/p2m: Fix one-off error in checking the P2M tree directory. xen/pciback: Fix proper FLR steps.Lorenzo Bianconi (1):
ath9k: fixdecrypt_errorinitialization inath_rx_tasklet()Luca Tettamanti (1):
hwmon: (asus_atk0110) Add quirk for Asus M5A78LMark Brown (1):
ASoC: wm9712: Fix microphone source selectionMathias Krause (1):
dccp: check ccid before dereferencingMel Gorman (1):
PARISC: RedefineATOMIC_INITandATOMIC64_INITto drop the castsMichael Cree (1):
alpha: Don't exportSOCK_NONBLOCKto user space.Michal Hocko (1):
mm: hugetlbfs: correctly populate shared pmdMike Frysinger (2):
alpha: fixfpu.husage in userspace
x32: Use compat shims for {g,s}etsockoptMike Galbraith (1):
sched,cgroup: Fix uptask_groupslistMike Snitzer (1):
SCSI:scsi_lib: fix scsi_io_completion'sSG_IOerror propagationMiklos Szeredi (4):
vfs: canonicalize create mode inbuild_open_flags()
audit: don'tfree_chunk()afterfsnotify_add_mark()
audit: fix refcounting in audit-tree
fuse: fix retrieve lengthMikulas Patocka (1):
Fix order of arguments to compat_put_time[spec|val]Oleg Nesterov (1):
uprobes: Fix mmap_region()'s mm->mm_rb corruption if uprobe_mmap() failsOliver Neukum (1):
usbnet: fix deadlock in resumePaul Mackerras (1):
powerpc: Make sure IPI handlers see data written by IPI sendersPavel Roskin (1):
ALSA: snd-usb: uselist_for_each_safefor endpoint resourcesPeter Ujfalusi (1):
ASoC: omap-mcbsp: Fix 6pin mux configurationRafael J. Wysocki (1):
PCI: EHCI: Fix crash during hibernation on ASUS computersRajkumar Manoharan (1):
ath9k: stop btcoex on device suspendRam Malovany (3):
Bluetooth: Fix using NULL inquiry entry
Bluetooth: Fix using a NULL inquiry cache entry
Bluetooth: Setname_stateto unknown when entry name is emptyRonny Hegewald (1):
xen: Use correct masking inxen_swiotlb_alloc_coherent.Shawn Guo (1):
ARM: imx6: spin the cpu until hardware takes it downStanislaw Gruszka (1):
sched: fix divide by zero at {thread_group,task}_timesStefan Behrens (1):
Btrfs: revert checksum error statistic which can cause aBUG()Stephen M. Cameron (1):
cciss: fix incorrect scsi status reportingSven Schnelle (1):
USB: CDC ACM: Fix NULL pointer dereferenceSzymon Janc (1):
Bluetooth: Fix legacy pairing with some devicesTakashi Iwai (2):
ALSA: hda - Fix leftovercodec->power_transition
ALSA: usb-audio: Fix scheduling-while-atomic bug in PCM capture streamTrond Myklebust (2):
NFSv3: Ensure thatdo_proc_get_root()reports errors correctly NFSv4.1: Remove a bogusBUG_ON()innfs4_layoutreturn_doneWang Xingchao (1):
ALSA: hda - fix Copyright debug messageWill Deacon (4):
ARM: 7483/1: vfp: only advertise VFPv4 in hwcaps ifCONFIG_VFPv3is enabled
ARM: 7487/1: mm: avoid setting nG bit for user mappings that aren't present
ARM: 7488/1: mm: use 5 bits for swapfile type encoding
ARM: 7489/1: errata: fix workaround for erratum #720789 on UP systemsYi Zou (1):
target: fix NULL pointer dereference bugalloc_page()fails to get memory[email protected] (1):
NFS: Alias the nfs module to nfs4[email protected] (1):
SCSI: mpt2sas: Fix for Driver oops, when loading driver withmax_queue_depthcommand line option to a very small value
Re: Linux 3.5.4 (was: Linux 3.5.3)
Quoted 1 line · Willy Tarreau
just a quick fix to $SUBJECT :-)
Ugh, ok, that's it, time to have these created from my release script and not do them by hand...
thanks for the correction.
greg k-h