Linux 3.10.25
Greg KH
maintainerI'm announcing the release of the 3.10.25 kernel.
All users of the 3.10 kernel series must upgrade.
The updated 3.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.10.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
------------
Makefile | 2 arch/arm/kernel/process.c | 7 + arch/arm/kernel/stacktrace.c | 2 arch/arm/mach-omap2/omap_hwmod.c | 43 ++++++++ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 13 -- arch/arm/mach-pxa/reset.c | 8 + arch/arm/mach-pxa/tosa.c | 102 ++++++++++----------- arch/mips/mm/dma-default.c | 16 ++- arch/powerpc/include/asm/pgalloc-32.h | 6 - arch/powerpc/include/asm/pgalloc-64.h | 6 - arch/x86/Makefile | 8 - arch/x86/boot/Makefile | 6 - arch/x86/boot/compressed/Makefile | 1 arch/x86/kvm/lapic.c | 35 ++++--- arch/x86/kvm/lapic.h | 4 arch/x86/kvm/x86.c | 40 -------- arch/x86/platform/efi/efi.c | 7 - arch/x86/realmode/rm/Makefile | 3 crypto/algif_hash.c | 3 crypto/algif_skcipher.c | 3 drivers/gpu/drm/i915/intel_display.c | 2 drivers/gpu/drm/radeon/r600_hdmi.c | 8 - drivers/gpu/drm/radeon/si.c | 11 +- drivers/hwmon/hih6130.c | 16 ++- drivers/hwmon/lm78.c | 2 drivers/hwmon/sis5595.c | 2 drivers/hwmon/vt8231.c | 2 drivers/hwmon/w83l786ng.c | 13 +- drivers/input/joystick/xpad.c | 1 drivers/input/touchscreen/usbtouchscreen.c | 22 +++- drivers/md/dm-bufio.c | 5 + drivers/md/dm-delay.c | 23 ++-- drivers/md/dm-snap.c | 71 +++++++++++++- drivers/md/dm-table.c | 5 + drivers/md/dm-thin.c | 4 drivers/md/persistent-data/dm-array.c | 10 +- drivers/md/persistent-data/dm-space-map-metadata.c | 8 + drivers/media/dvb-frontends/af9033.c | 12 +- drivers/media/dvb-frontends/cxd2820r_core.c | 4 drivers/media/i2c/wm8775.c | 4 drivers/media/pci/bt8xx/bttv-driver.c | 3 drivers/media/pci/saa7164/saa7164-core.c | 4 drivers/media/usb/dvb-usb-v2/af9035.c | 17 ++- drivers/net/ethernet/intel/igb/e1000_phy.c | 5 - drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 22 ++-- drivers/net/wireless/iwlwifi/mvm/debugfs.c | 4 drivers/net/wireless/mwifiex/sta_ioctl.c | 4 drivers/pci/pci-driver.c | 12 +- drivers/rtc/rtc-at91rm9200.c | 2 drivers/staging/comedi/drivers/amplc_pc263.c | 3 drivers/staging/comedi/drivers/amplc_pci263.c | 3 drivers/staging/comedi/drivers/pcmuio.c | 11 +- drivers/staging/comedi/drivers/ssv_dnp.c | 6 - drivers/usb/core/hub.c | 5 - drivers/usb/dwc3/ep0.c | 2 drivers/usb/dwc3/gadget.c | 5 - drivers/usb/gadget/composite.c | 1 drivers/usb/serial/option.c | 27 +++++ drivers/watchdog/sc1200wdt.c | 3 fs/btrfs/acl.c | 2 fs/btrfs/inode.c | 47 +++++---- fs/btrfs/ioctl.c | 3 fs/btrfs/send.c | 4 fs/btrfs/tree-log.c | 2 fs/btrfs/volumes.c | 2 fs/nfs/blocklayout/extents.c | 2 fs/nfs/nfs4proc.c | 3 fs/nfsd/nfscache.c | 9 + fs/xfs/xfs_fsops.c | 6 + fs/xfs/xfs_ioctl.c | 3 fs/xfs/xfs_ioctl32.c | 3 include/linux/compiler-intel.h | 2 include/linux/kexec.h | 3 include/sound/memalloc.h | 2 include/uapi/sound/compress_offload.h | 6 - kernel/futex.c | 2 kernel/kexec.c | 4 kernel/sched/debug.c | 8 + kernel/sched/fair.c | 2 net/ipv4/udp.c | 3 net/ipv6/ip6_tunnel.c | 2 net/mac80211/cfg.c | 3 net/mac80211/rx.c | 3 security/selinux/hooks.c | 93 +++++++++++++++---- sound/pci/hda/hda_generic.c | 47 +++++++++ sound/pci/hda/hda_generic.h | 3 sound/pci/hda/patch_analog.c | 10 ++ sound/pci/hda/patch_hdmi.c | 5 - virt/kvm/kvm_main.c | 3 89 files changed, 649 insertions(+), 317 deletions(-)
Alan (1):
sc1200_wdt: Fix oops
Alan Stern (1):
usb: dwc3: fix implementation of endpoint wedge
Alex Deucher (2):
drm/radeon: program DCE2 audio dto just like DCE3 drm/radeon: fixup bad vram size on SI
Andy Adamson (1):
NFSv4 wait on recovery for async session errors
Andy Honig (3):
KVM: Improve create VCPU parameter (CVE-2013-4587)
KVM: x86: Fix potential divide by 0 in lapic (CVE-2013-6367)
KVM: x86: Convert vapic synchronization to _cached functions (CVE-2013-6368)Anssi Hannula (1):
ALSA: hda - hdmi: Fix IEC958 ctl indexes for some simple HDMI devices
Antti Palosaari (3):
media: af9035: fix broken I2C and USB I/O
media: af9033: fix broken I2C
media: af9035: add [0413:6a05] Leadtek WinFast DTV Dongle Dual
Ben Segall (1):
sched: Avoid throttle_cfs_rq() racing with period_timer stopping
Bob Copeland (1):
Revert "mac80211: allow disable power save in mesh"
Brian Carnes (1):
hwmon: (w83l786ng) Fix fan speed control mode setting and reporting
Carolyn Wyborny (1):
igb: Fix for issue where values could be too high for udelay function.
Christian Engelmayer (1):
Input: usbtouchscreen - separate report and transmit buffer size handling
Dan Carpenter (4):
hwmon: Prevent some divide by zeros in FAN_TO_REG()
xfs: underflow bug in xfs_attrlist_by_handle()
media: af9035: unlock on error in af9035_i2c_master_xfer()
Btrfs: fix access_ok() check in btrfs_ioctl_send()
Dave Chinner (1):
xfs: growfs overruns AGFL buffer on V4 filesystems
David Sterba (1):
btrfs: call mnt_drop_write after interrupted subvol deletion
Dmitry Eremin-Solenikov (1):
ARM: pxa: tosa: fix keys mapping
Fangxiaozhi (Franko) (1):
USB: option: support new huawei devices
Filipe David Borba Manana (1):
Btrfs: fix incorrect inode acl reset
Gleb Natapov (1):
KVM: x86: fix guest-initiated crash with x2apic (CVE-2013-6376)
Greg Kroah-Hartman (2):
Revert "net: update consumers of MSG_MORE to recognize MSG_SENDPAGE_NOTLAST" Linux 3.10.25
Gustavo Zacarias (1):
USB: serial: option: blacklist interface 1 for Huawei E173s-6
H Hartley Sweeten (2):
staging: comedi: drivers: use comedi_dio_update_state() for simple cases
staging: comedi: ssv_dnp: use comedi_dio_update_state()
H. Peter Anvin (2):
x86, build: Pass in additional -mno-mmx, -mno-sse options x86, build, icc: Remove uninitialized_var() from compiler-intel.h
Hans Verkuil (3):
media: bttv: don't setup the controls if there are no video devices
media: wm8775: fix broken audio routing
cxd2820r_core: fix sparse warnings
Helge Deller (1):
nfs: fix do_div() warning by instead using sector_div()
Hong H. Pham (1):
powerpc: Fix PTE page address mismatch in pgtable ctor/dtor
Ian Abbott (1):
staging: comedi: pcmuio: fix possible NULL deref on detach
Jean Delvare (1):
hwmon: (w83l768ng) Fix fan speed control range
Jeff Layton (1):
nfsd: when reusing an existing repcache entry, unhash it first
Jim Quinlan (1):
MIPS: DMA: For BMIPS5000 cores flush region just like non-coherent R10000
Joe Thornber (2):
dm array: fix a reference counting bug in shadow_ablock dm thin: switch to read only mode if a mapping insert fails
Johannes Berg (2):
mac80211: don't attempt to reorder multicast frames
iwlwifi: mvm: check sta_id/drain values in debugfs
Josef Bacik (1):
Btrfs: fix hole check in log_one_extent
José Miguel Gonçalves (1):
hwmon: HIH-6130: Support I2C bus drivers without I2C_FUNC_SMBUS_QUICK
Julius Werner (1):
usb: hub: Use correct reset for wedged USB3 devices that are NOTATTACHED
Khalid Aziz (1):
PCI: Disable Bus Master only on kexec reboot
Konstantin Khlebnikov (2):
ARM: 7912/1: check stack pointer in get_wchan
ARM: 7913/1: fix framepointer check in unwind_frame
Linus Pizunski (1):
drivers/rtc/rtc-at91rm9200.c: correct alarm over day/month wrap
Linus Torvalds (1):
futex: fix handling of read-only-mapped hugepages
Liu Bo (2):
Btrfs: fix memory leak of chunks' extent map
Btrfs: do not run snapshot-aware defragment on error
Mag (1):
Input: xpad - add signature for Razer Onza Classic Edition
Matthew Garrett (1):
x86, efi: Don't use (U)EFI time services on 32 bit
Michael Grzeschik (1):
usb: gadget: composite: reset delayed_status on reset_config
Mike Snitzer (1):
dm space map metadata: return on failure in sm_metadata_new_block
Mikulas Patocka (4):
dm bufio: initialize read-only module parameters dm snapshot: avoid snapshot space leak on crash dm delay: fix a possible deadlock due to shared workqueue dm table: fail dm_table_create on dm_round_up overflow
Nicolas Dichtel (1):
ip6tnl: fix use after free of fb_tnl_dev
Paul Moore (2):
selinux: handle TCP SYN-ACK packets correctly in selinux_ip_output()
selinux: handle TCP SYN-ACK packets correctly in selinux_ip_postroute()
Roger Quadros (2):
ARM: OMAP3: hwmod data: Don't prevent RESET of USB Host module
ARM: OMAP2+: hwmod: Fix SOFTRESET logic
Sergei Ianovich (1):
ARM: pxa: prevent PXA270 occasional reboot freezes
Stefano Panella (1):
ALSA: memalloc.h - fix wrong truncation of dma_addr_t
Sujith Manoharan (2):
ath9k: Fix QuickDrop usage
ath9k: Fix XLNA bias strength
Takashi Iwai (3):
ALSA: compress: Fix 64bit ABI incompatibility
ALSA: hda - Add static DAC/pin mapping for AD1986A codec
ALSA: hda - Mute all aamix inputs as default
Ujjal Roy (1):
mwifiex: fix memory leak issue for ibss join
Ville Syrjälä (1):
drm/i915: Fix pipe CSC post offset calculation
Wei Yongjun (1):
media: saa7164: fix return value check in saa7164_initdev()
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 10 -SUBLEVEL = 24 +SUBLEVEL = 25 EXTRAVERSION = NAME = TOSSUG Baby Fish
arch/arm/kernel/process.c +5 -2
@@ -408,6 +408,7 @@ EXPORT_SYMBOL(dump_fpu);unsigned long get_wchan (struct task_struct *p) {struct stackframe frame; +unsigned long stack_page;int count =0 ;if (!p || p == current || p->state ==TASK_RUNNING )return 0 ;
@@ -416,9 +417,11 @@ unsigned long get_wchan(struct task_struct *p) frame.sp =thread_saved_sp (p); frame.lr =0 ;/* recovered from the stack */ frame.pc =thread_saved_pc (p); + stack_page = (unsigned long )task_stack_page (p); do { - int ret = unwind_frame(&frame); - if (ret < 0) + if (frame.sp < stack_page || + frame.sp >= stack_page + THREAD_SIZE || + unwind_frame(&frame) < 0) return 0; if (!in_sched_functions(frame.pc)) return frame.pc;
arch/arm/kernel/stacktrace.c +1 -1
@@ -31,7 +31,7 @@ int notrace unwind_frame(struct stackframe *frame) high =ALIGN (low,THREAD_SIZE );/* check current frame pointer is within bounds */ -if (fp < (low +12 ) || fp +4 >= high) +if (fp < low +12 || fp > high -4 )return -EINVAL ;/* restore the registers from the stack frame */
arch/arm/mach-omap2/omap_hwmod.c +42 -1
67 lines not on this page · raw message
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +3 -10
@@ -1930,7 +1930,8 @@ static struct omap_hwmod_class_sysconfig omap3xxx_usb_host_hs_sysc = { .syss_offs = 0x0014, .sysc_flags = (SYSC_HAS_MIDLEMODE |SYSC_HAS_CLOCKACTIVITY |SYSC_HAS_SIDLEMODE |SYSC_HAS_ENAWAKEUP | - SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE), +SYSC_HAS_SOFTRESET |SYSC_HAS_AUTOIDLE | + SYSS_HAS_RESET_STATUS), .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART | MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART), .sysc_fields = &omap_hwmod_sysc_type1,
@@ -2008,15 +2009,7 @@ static struct omap_hwmod omap3xxx_usb_host_hs_hwmod = {* hence HWMOD_SWSUP_MSTANDBY */ -/* -* During system boot; If the hwmod framework resets the module -* the module will have smart idle settings; which can lead to deadlock -* (above Errata Id:i660); so, dont reset the module during boot; -* Use HWMOD_INIT_NO_RESET. -*/ - - .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY | - HWMOD_INIT_NO_RESET, + .flags = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY, };/*
arch/arm/mach-pxa/reset.c +7 -1
@@ -13,6 +13,7 @@#include <mach/regs-ost.h> #include <mach/reset.h> +#include <mach/smemc.h> unsigned int reset_status;EXPORT_SYMBOL (reset_status);
@@ -81,6 +82,12 @@ static void do_hw_reset(void)writel_relaxed (OSSR_M3 ,OSSR );/* ... in 100 ms */ writel_relaxed (readl_relaxed (OSCR ) +368640 ,OSMR3 ); +/* +* SDRAM hangs on watchdog reset on Marvell PXA270 (erratum 71) +* we put SDRAM into self-refresh to prevent that +*/ +while (1 ) +writel_relaxed (MDREFR_SLFRSH ,MDREFR ); }void pxa_restart (char mode,const char *cmd)
@@ -104,4 +111,3 @@ void pxa_restart(char mode, const char *cmd)break ; } } -
arch/arm/mach-pxa/tosa.c +51 -51
108 lines not on this page · raw message
arch/mips/mm/dma-default.c +10 -6
@@ -50,16 +50,20 @@ static inline struct page *dma_addr_to_page(struct device *dev, }/* +* The affected CPUs below in 'cpu_needs_post_dma_flush()' can +* speculatively fill random cachelines with stale data at any time, +* requiring an extra flush post-DMA. +* * Warning on the terminology - Linux calls an uncached area coherent; * MIPS terminology calls memory areas with hardware maintained coherency * coherent. */ - -static inline int cpu_is_noncoherent_r10000 (struct device *dev) +static inline int cpu_needs_post_dma_flush (struct device *dev) {return !plat_device_is_coherent (dev) && (current_cpu_type () ==CPU_R10000 || -current_cpu_type () ==CPU_R12000 ); +current_cpu_type () ==CPU_R12000 || +current_cpu_type () ==CPU_BMIPS5000 ); }static gfp_t massage_gfp_flags (const struct device *dev,gfp_t gfp)
@@ -230,7 +234,7 @@ static inline void __dma_sync(struct page *page,static void mips_dma_unmap_page (struct device *dev,dma_addr_t dma_addr,size_t size,enum dma_data_direction direction,struct dma_attrs *attrs) { -if (cpu_is_noncoherent_r10000 (dev)) +if (cpu_needs_post_dma_flush (dev))__dma_sync (dma_addr_to_page (dev, dma_addr), dma_addr & ~PAGE_MASK , size, direction);
@@ -281,7 +285,7 @@ static void mips_dma_unmap_sg(struct device *dev, struct scatterlist *sg,static void mips_dma_sync_single_for_cpu (struct device *dev,dma_addr_t dma_handle,size_t size,enum dma_data_direction direction) { -if (cpu_is_noncoherent_r10000 (dev)) +if (cpu_needs_post_dma_flush (dev))__dma_sync (dma_addr_to_page (dev, dma_handle), dma_handle & ~PAGE_MASK , size, direction); }
@@ -302,7 +306,7 @@ static void mips_dma_sync_sg_for_cpu(struct device *dev,/* Make sure that gcc doesn't leave the empty loop body. */ for (i =0 ; i < nelems; i++, sg++) { -if (cpu_is_noncoherent_r10000 (dev)) +if (cpu_needs_post_dma_flush (dev))__dma_sync (sg_page (sg), sg->offset, sg->length, direction); }
arch/powerpc/include/asm/pgalloc-32.h +2 -4
@@ -84,10 +84,8 @@ static inline void pgtable_free_tlb(struct mmu_gather *tlb,static inline void __pte_free_tlb (struct mmu_gather *tlb,pgtable_t table,unsigned long address) { -struct page *page =page_address (table); -tlb_flush_pgtable (tlb, address); -pgtable_page_dtor (page); -pgtable_free_tlb (tlb, page,0 ); +pgtable_page_dtor (table); +pgtable_free_tlb (tlb,page_address (table),0 ); }#endif /* _ASM_POWERPC_PGALLOC_32_H */
arch/powerpc/include/asm/pgalloc-64.h +2 -4
@@ -144,11 +144,9 @@ static inline void pgtable_free_tlb(struct mmu_gather *tlb,static inline void __pte_free_tlb (struct mmu_gather *tlb,pgtable_t table,unsigned long address) { -struct page *page =page_address (table); -tlb_flush_pgtable (tlb, address); -pgtable_page_dtor (page); -pgtable_free_tlb (tlb, page,0 ); +pgtable_page_dtor (table); +pgtable_free_tlb (tlb,page_address (table),0 ); }#else /* if CONFIG_PPC_64K_PAGES */
arch/x86/Makefile +4 -4
@@ -31,8 +31,8 @@ ifeq ($(CONFIG_X86_32),y) KBUILD_CFLAGS += -msoft-float -mregparm=3 -freg-struct-return - # Don't autogenerate SSE instructions - KBUILD_CFLAGS += -mno-sse + # Don't autogenerate MMX or SSE instructions + KBUILD_CFLAGS += -mno-mmx -mno-sse # Never want PIC in a 32-bit kernel, prevent breakage with GCC built # with nonstandard options
@@ -60,8 +60,8 @@ else KBUILD_AFLAGS += -m64 KBUILD_CFLAGS += -m64 - # Don't autogenerate SSE instructions - KBUILD_CFLAGS += -mno-sse + # Don't autogenerate MMX or SSE instructions + KBUILD_CFLAGS += -mno-mmx -mno-sse # Use -mpreferred-stack-boundary=3 if supported. KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=3)
arch/x86/boot/Makefile +3 -3
@@ -53,18 +53,18 @@ $(obj)/cpustr.h: $(obj)/mkcpustr FORCE # How to compile the 16-bit code. Note we always compile for -march=i386, # that way we can complain to the user if the CPU is insufficient. -KBUILD_CFLAGS := $(USERINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \ +KBUILD_CFLAGS := $(USERINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ \ -DDISABLE_BRANCH_PROFILING \ -Wall -Wstrict-prototypes \ -march=i386 -mregparm=3 \ -include $(srctree)/$(src)/code16gcc.h \ -fno-strict-aliasing -fomit-frame-pointer -fno-pic \ + -mno-mmx -mno-sse \ $(call cc-option, -ffreestanding) \ $(call cc-option, -fno-toplevel-reorder,\ - $(call cc-option, -fno-unit-at-a-time)) \ + $(call cc-option, -fno-unit-at-a-time)) \ $(call cc-option, -fno-stack-protector) \ $(call cc-option, -mpreferred-stack-boundary=2) -KBUILD_CFLAGS += $(call cc-option, -m32) KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ GCOV_PROFILE := n
arch/x86/boot/compressed/Makefile +1 -0
@@ -12,6 +12,7 @@ KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING cflags-$(CONFIG_X86_32) := -march=i386 cflags-$(CONFIG_X86_64) := -mcmodel=small KBUILD_CFLAGS += $(cflags-y) +KBUILD_CFLAGS += -mno-mmx -mno-sse KBUILD_CFLAGS += $(call cc-option,-ffreestanding) KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
arch/x86/kvm/lapic.c +21 -14
@@ -153,6 +153,8 @@ static inline int kvm_apic_id(struct kvm_lapic *apic)return (kvm_apic_get_reg (apic,APIC_ID ) >>24 ) &0xff ; } +#define KVM_X2APIC_CID_BITS 0 +static void recalculate_apic_map (struct kvm *kvm) {struct kvm_apic_map *new, *old =NULL ;
@@ -190,7 +192,8 @@ static void recalculate_apic_map(struct kvm *kvm)if (apic_x2apic_mode (apic)) { new->ldr_bits =32 ; new->cid_shift =16 ; - new->cid_mask = new->lid_mask =0xffff ; + new->cid_mask = (1 <<KVM_X2APIC_CID_BITS ) -1 ; + new->lid_mask =0xffff ; }else if (kvm_apic_sw_enabled (apic) && !new->cid_mask/* flat mode */ &&kvm_apic_get_reg (apic,APIC_DFR ) ==APIC_DFR_CLUSTER ) {
@@ -855,7 +858,8 @@ static u32 apic_get_tmcct(struct kvm_lapic *apic)ASSERT (apic !=NULL );/* if initial count is 0, current count should also be 0 */ -if (kvm_apic_get_reg (apic,APIC_TMICT ) ==0 ) +if (kvm_apic_get_reg (apic,APIC_TMICT ) ==0 || + apic->lapic_timer.period ==0 )return 0 ; remaining =hrtimer_get_remaining (&apic->lapic_timer.timer);
@@ -1705,7 +1709,6 @@ static void apic_sync_pv_eoi_from_guest(struct kvm_vcpu *vcpu,void kvm_lapic_sync_from_vapic (struct kvm_vcpu *vcpu) {u32 data; -void *vapic;if (test_bit (KVM_APIC_PV_EOI_PENDING , &vcpu->arch.apic_attention))apic_sync_pv_eoi_from_guest (vcpu, vcpu->arch.apic);
@@ -1713,9 +1716,8 @@ void kvm_lapic_sync_from_vapic(struct kvm_vcpu *vcpu)if (!test_bit (KVM_APIC_CHECK_VAPIC , &vcpu->arch.apic_attention))return ; - vapic =kmap_atomic (vcpu->arch.apic->vapic_page); - data = *(u32 *)(vapic +offset_in_page (vcpu->arch.apic->vapic_addr)); -kunmap_atomic (vapic); +kvm_read_guest_cached (vcpu->kvm, &vcpu->arch.apic->vapic_cache, &data, +sizeof (u32));apic_set_tpr (vcpu->arch.apic, data &0xff ); }
@@ -1751,7 +1753,6 @@ void kvm_lapic_sync_to_vapic(struct kvm_vcpu *vcpu)u32 data, tpr;int max_irr, max_isr;struct kvm_lapic *apic = vcpu->arch.apic; -void *vapic;apic_sync_pv_eoi_to_guest (vcpu, apic);
@@ -1767,18 +1768,24 @@ void kvm_lapic_sync_to_vapic(struct kvm_vcpu *vcpu) max_isr =0 ; data = (tpr &0xff ) | ((max_isr &0xf0 ) <<8 ) | (max_irr <<24 ); - vapic =kmap_atomic (vcpu->arch.apic->vapic_page); - *(u32 *)(vapic +offset_in_page (vcpu->arch.apic->vapic_addr)) = data; -kunmap_atomic (vapic); +kvm_write_guest_cached (vcpu->kvm, &vcpu->arch.apic->vapic_cache, &data, +sizeof (u32)); } -void kvm_lapic_set_vapic_addr (struct kvm_vcpu *vcpu,gpa_t vapic_addr) +int kvm_lapic_set_vapic_addr (struct kvm_vcpu *vcpu,gpa_t vapic_addr) { - vcpu->arch.apic->vapic_addr = vapic_addr; -if (vapic_addr) +if (vapic_addr) { +if (kvm_gfn_to_hva_cache_init (vcpu->kvm, + &vcpu->arch.apic->vapic_cache, + vapic_addr,sizeof (u32))) +return -EINVAL ;__set_bit (KVM_APIC_CHECK_VAPIC , &vcpu->arch.apic_attention); -else + }else {__clear_bit (KVM_APIC_CHECK_VAPIC , &vcpu->arch.apic_attention); + } + + vcpu->arch.apic->vapic_addr = vapic_addr; +return 0 ; }int kvm_x2apic_msr_write (struct kvm_vcpu *vcpu,u32 msr,u64 data)
arch/x86/kvm/lapic.h +2 -2
@@ -34,7 +34,7 @@ struct kvm_lapic {*/ void *regs;gpa_t vapic_addr; -struct page *vapic_page; +struct gfn_to_hva_cache vapic_cache;unsigned long pending_events;unsigned int sipi_vector; };
@@ -76,7 +76,7 @@ void kvm_set_lapic_tscdeadline_msr(struct kvm_vcpu *vcpu, u64 data);void kvm_apic_write_nodecode (struct kvm_vcpu *vcpu,u32 offset);void kvm_apic_set_eoi_accelerated (struct kvm_vcpu *vcpu,int vector); -void kvm_lapic_set_vapic_addr (struct kvm_vcpu *vcpu,gpa_t vapic_addr); +int kvm_lapic_set_vapic_addr (struct kvm_vcpu *vcpu,gpa_t vapic_addr);void kvm_lapic_sync_from_vapic (struct kvm_vcpu *vcpu);void kvm_lapic_sync_to_vapic (struct kvm_vcpu *vcpu);
arch/x86/kvm/x86.c +1 -39
@@ -3138,8 +3138,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp, r = -EFAULT ;if (copy_from_user (&va, argp,sizeof va)) goto out; - r =0 ; -kvm_lapic_set_vapic_addr (vcpu, va.vapic_addr); + r =kvm_lapic_set_vapic_addr (vcpu, va.vapic_addr);break ; }case KVM_X86_SETUP_MCE : {
@@ -5539,36 +5538,6 @@ static void post_kvm_run_save(struct kvm_vcpu *vcpu) !kvm_event_needs_reinjection (vcpu); } -static int vapic_enter (struct kvm_vcpu *vcpu) -{ -struct kvm_lapic *apic = vcpu->arch.apic; -struct page *page; - -if (!apic || !apic->vapic_addr) -return 0 ; - - page =gfn_to_page (vcpu->kvm, apic->vapic_addr >>PAGE_SHIFT ); -if (is_error_page (page)) -return -EFAULT ; - - vcpu->arch.apic->vapic_page = page; -return 0 ; -} - -static void vapic_exit (struct kvm_vcpu *vcpu) -{ -struct kvm_lapic *apic = vcpu->arch.apic; -int idx; - -if (!apic || !apic->vapic_addr) -return ; - - idx =srcu_read_lock (&vcpu->kvm->srcu); -kvm_release_page_dirty (apic->vapic_page); -mark_page_dirty (vcpu->kvm, apic->vapic_addr >>PAGE_SHIFT ); -srcu_read_unlock (&vcpu->kvm->srcu, idx); -} -static void update_cr8_intercept (struct kvm_vcpu *vcpu) {int max_irr, tpr;
@@ -5889,11 +5858,6 @@ static int __vcpu_run(struct kvm_vcpu *vcpu)struct kvm *kvm = vcpu->kvm; vcpu->srcu_idx =srcu_read_lock (&kvm->srcu); - r =vapic_enter (vcpu); -if (r) { -srcu_read_unlock (&kvm->srcu, vcpu->srcu_idx); -return r; - } r =1 ;while (r >0 ) {
@@ -5951,8 +5915,6 @@ static int __vcpu_run(struct kvm_vcpu *vcpu)srcu_read_unlock (&kvm->srcu, vcpu->srcu_idx); -vapic_exit (vcpu); -return r; }
arch/x86/platform/efi/efi.c +0 -7
@@ -766,13 +766,6 @@ void __init efi_init(void)set_bit (EFI_MEMMAP , &x86_efi_facility); -#ifdef CONFIG_X86_32 -if (efi_is_native ()) { - x86_platform.get_wallclock = efi_get_time; - x86_platform.set_wallclock = efi_set_rtc_mmss; - } -#endif -#if EFI_DEBUG print_efi_memmap ();#endif
arch/x86/realmode/rm/Makefile +2 -1
@@ -73,9 +73,10 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ -D_WAKEUP \ -march=i386 -mregparm=3 \ -include $(srctree)/$(src)/../../boot/code16gcc.h \ -fno-strict-aliasing -fomit-frame-pointer -fno-pic \ + -mno-mmx -mno-sse \ $(call cc-option, -ffreestanding) \ $(call cc-option, -fno-toplevel-reorder,\ - $(call cc-option, -fno-unit-at-a-time)) \ + $(call cc-option, -fno-unit-at-a-time)) \ $(call cc-option, -fno-stack-protector) \ $(call cc-option, -mpreferred-stack-boundary=2) KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
crypto/algif_hash.c +0 -3
@@ -117,9 +117,6 @@ static ssize_t hash_sendpage(struct socket *sock, struct page *page,if (flags &MSG_SENDPAGE_NOTLAST ) flags |=MSG_MORE ; -if (flags &MSG_SENDPAGE_NOTLAST ) - flags |=MSG_MORE ; -lock_sock (sk);sg_init_table (ctx->sgl.sg,1 );sg_set_page (ctx->sgl.sg, page, size, offset);
crypto/algif_skcipher.c +0 -3
@@ -381,9 +381,6 @@ static ssize_t skcipher_sendpage(struct socket *sock, struct page *page,if (flags &MSG_SENDPAGE_NOTLAST ) flags |=MSG_MORE ; -if (flags &MSG_SENDPAGE_NOTLAST ) - flags |=MSG_MORE ; -lock_sock (sk);if (!ctx->more && ctx->used) goto unlock;
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -5225,7 +5225,7 @@ static void intel_set_pipe_csc(struct drm_crtc *crtc)uint16_t postoff =0 ;if (intel_crtc->config.limited_color_range) - postoff = (16 * (1 <<13 ) /255 ) &0x1fff ; + postoff = (16 * (1 <<12 ) /255 ) &0x1fff ;I915_WRITE (PIPE_CSC_POSTOFF_HI (pipe), postoff);I915_WRITE (PIPE_CSC_POSTOFF_ME (pipe), postoff);
drivers/gpu/drm/radeon/r600_hdmi.c +2 -6
@@ -279,9 +279,9 @@ void r600_audio_set_dto(struct drm_encoder *encoder, u32 clock)WREG32 (DCCG_AUDIO_DTO1_MODULE , clock *100 );WREG32 (DCCG_AUDIO_DTO_SELECT ,1 );/* select DTO1 */ } - }else if (ASIC_IS_DCE3 (rdev)) { + }else {/* according to the reg specs, this should DCE3.2 only, but in -* practice it seems to cover DCE3.0/3.1 as well. +* practice it seems to cover DCE2.0/3.0/3.1 as well. */ if (dig->dig_encoder ==0 ) {WREG32 (DCCG_AUDIO_DTO0_PHASE , base_rate *100 );
@@ -292,10 +292,6 @@ void r600_audio_set_dto(struct drm_encoder *encoder, u32 clock)WREG32 (DCCG_AUDIO_DTO1_MODULE , clock *100 );WREG32 (DCCG_AUDIO_DTO_SELECT ,1 );/* select DTO1 */ } - }else { -/* according to the reg specs, this should be DCE2.0 and DCE3.0/3.1 */ -WREG32 (AUDIO_DTO ,AUDIO_DTO_PHASE (base_rate /10 ) | -AUDIO_DTO_MODULE (clock /10 )); } }
drivers/gpu/drm/radeon/si.c +9 -2
@@ -3615,8 +3615,15 @@ static int si_mc_init(struct radeon_device *rdev) rdev->mc.aper_base =pci_resource_start (rdev->pdev,0 ); rdev->mc.aper_size =pci_resource_len (rdev->pdev,0 );/* size in MB on si */ - rdev->mc.mc_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024ULL *1024ULL ; - rdev->mc.real_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024ULL *1024ULL ; + tmp =RREG32 (CONFIG_MEMSIZE ); +/* some boards may have garbage in the upper 16 bits */ +if (tmp &0xffff0000 ) { +DRM_INFO ("Probable bad vram size: 0x%08x\n" , tmp); +if (tmp &0xffff ) + tmp &=0xffff ; + } + rdev->mc.mc_vram_size = tmp *1024ULL *1024ULL ; + rdev->mc.real_vram_size = rdev->mc.mc_vram_size; rdev->mc.visible_vram_size = rdev->mc.aper_size;si_vram_gtt_location (rdev, &rdev->mc);radeon_update_bandwidth_info (rdev);
drivers/hwmon/hih6130.c +14 -2
@@ -43,6 +43,7 @@* @last_update: time of last update (jiffies) * @temperature: cached temperature measurement value * @humidity: cached humidity measurement value +* @write_length: length for I2C measurement request */ struct hih6130 {struct device *hwmon_dev;
@@ -51,6 +52,7 @@ struct hih6130 {unsigned long last_update;int temperature;int humidity; +size_t write_length; };/**
@@ -121,8 +123,15 @@ static int hih6130_update_measurements(struct i2c_client *client)*/ if (time_after (jiffies, hih6130->last_update +HZ ) || !hih6130->valid) { -/* write to slave address, no data, to request a measurement */ - ret =i2c_master_send (client, tmp,0 ); +/* +* Write to slave address to request a measurement. +* According with the datasheet it should be with no data, but +* for systems with I2C bus drivers that do not allow zero +* length packets we write one dummy byte to allow sensor +* measurements on them. +*/ + tmp[0 ] =0 ; + ret =i2c_master_send (client, tmp, hih6130->write_length);if (ret <0 ) goto out;
@@ -252,6 +261,9 @@ static int hih6130_probe(struct i2c_client *client, goto fail_remove_sysfs; } +if (!i2c_check_functionality (client->adapter,I2C_FUNC_SMBUS_QUICK )) + hih6130->write_length =1 ; +return 0 ; fail_remove_sysfs:
drivers/hwmon/lm78.c +2 -0
@@ -94,6 +94,8 @@ static inline u8 FAN_TO_REG(long rpm, int div) {if (rpm <=0 )return 255 ; +if (rpm >1350000 ) +return 1 ;return clamp_val ((1350000 + rpm * div /2 ) / (rpm * div),1 ,254 ); }
drivers/hwmon/sis5595.c +2 -0
@@ -141,6 +141,8 @@ static inline u8 FAN_TO_REG(long rpm, int div) {if (rpm <=0 )return 255 ; +if (rpm >1350000 ) +return 1 ;return clamp_val ((1350000 + rpm * div /2 ) / (rpm * div),1 ,254 ); }
drivers/hwmon/vt8231.c +1 -1
@@ -145,7 +145,7 @@ static const u8 regtempmin[] = { 0x3a, 0x3e, 0x2c, 0x2e, 0x30, 0x32 };*/ static inline u8 FAN_TO_REG (long rpm,int div) { -if (rpm ==0 ) +if (rpm <=0 || rpm >1310720 )return 0 ;return clamp_val (1310720 / (rpm * div),1 ,255 ); }
drivers/hwmon/w83l786ng.c +8 -5
@@ -481,9 +481,11 @@ store_pwm(struct device *dev, struct device_attribute *attr,if (err)return err; val =clamp_val (val,0 ,255 ); + val =DIV_ROUND_CLOSEST (val,0x11 );mutex_lock (&data->update_lock); - data->pwm[nr] = val; + data->pwm[nr] = val *0x11 ; + val |=w83l786ng_read_value (client,W83L786NG_REG_PWM [nr]) &0xf0 ;w83l786ng_write_value (client,W83L786NG_REG_PWM [nr], val);mutex_unlock (&data->update_lock);return count;
@@ -510,7 +512,7 @@ store_pwm_enable(struct device *dev, struct device_attribute *attr,mutex_lock (&data->update_lock); reg =w83l786ng_read_value (client,W83L786NG_REG_FAN_CFG ); data->pwm_enable[nr] = val; - reg &= ~(0x02 <<W83L786NG_PWM_ENABLE_SHIFT [nr]); + reg &= ~(0x03 <<W83L786NG_PWM_ENABLE_SHIFT [nr]); reg |= (val -1 ) <<W83L786NG_PWM_ENABLE_SHIFT [nr];w83l786ng_write_value (client,W83L786NG_REG_FAN_CFG , reg);mutex_unlock (&data->update_lock);
@@ -776,9 +778,10 @@ static struct w83l786ng_data *w83l786ng_update_device(struct device *dev) ((pwmcfg >>W83L786NG_PWM_MODE_SHIFT [i]) &1 ) ?0 :1 ; data->pwm_enable[i] = - ((pwmcfg >>W83L786NG_PWM_ENABLE_SHIFT [i]) &2 ) +1 ; - data->pwm[i] =w83l786ng_read_value (client, -W83L786NG_REG_PWM [i]); + ((pwmcfg >>W83L786NG_PWM_ENABLE_SHIFT [i]) &3 ) +1 ; + data->pwm[i] = + (w83l786ng_read_value (client,W83L786NG_REG_PWM [i]) + &0x0f ) *0x11 ; }
drivers/input/joystick/xpad.c +1 -0
@@ -167,6 +167,7 @@ static const struct xpad_device { { 0x1430, 0x8888, "TX6500+ Dance Pad (first generation)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX }, { 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller", 0, XTYPE_XBOX360 }, { 0x1689, 0xfd00, "Razer Onza Tournament Edition", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 }, + { 0x1689, 0xfd01, "Razer Onza Classic Edition", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 }, { 0x1bad, 0x0002, "Harmonix Rock Band Guitar", 0, XTYPE_XBOX360 }, { 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 }, { 0x1bad, 0xf016, "Mad Catz Xbox 360 Controller", 0, XTYPE_XBOX360 },
drivers/input/touchscreen/usbtouchscreen.c +18 -4
@@ -106,6 +106,7 @@ struct usbtouch_device_info {struct usbtouch_usb {unsigned char *data;dma_addr_t data_dma; +int data_size;unsigned char *buffer;int buf_len;struct urb *irq;
@@ -1521,7 +1522,7 @@ static int usbtouch_reset_resume(struct usb_interface *intf)static void usbtouch_free_buffers (struct usb_device *udev,struct usbtouch_usb *usbtouch) { -usb_free_coherent (udev, usbtouch->type->rept_size, +usb_free_coherent (udev, usbtouch->data_size, usbtouch->data, usbtouch->data_dma);kfree (usbtouch->buffer); }
@@ -1566,7 +1567,20 @@ static int usbtouch_probe(struct usb_interface *intf,if (!type->process_pkt) type->process_pkt = usbtouch_process_pkt; - usbtouch->data =usb_alloc_coherent (udev, type->rept_size, + usbtouch->data_size = type->rept_size; +if (type->get_pkt_len) { +/* +* When dealing with variable-length packets we should +* not request more than wMaxPacketSize bytes at once +* as we do not know if there is more data coming or +* we filled exactly wMaxPacketSize bytes and there is +* nothing else. +*/ + usbtouch->data_size =min (usbtouch->data_size, +usb_endpoint_maxp (endpoint)); + } + + usbtouch->data =usb_alloc_coherent (udev, usbtouch->data_size,GFP_KERNEL , &usbtouch->data_dma);if (!usbtouch->data) goto out_free;
@@ -1626,12 +1640,12 @@ static int usbtouch_probe(struct usb_interface *intf,if (usb_endpoint_type (endpoint) ==USB_ENDPOINT_XFER_INT )usb_fill_int_urb (usbtouch->irq, udev,usb_rcvintpipe (udev, endpoint->bEndpointAddress), - usbtouch->data, type->rept_size, + usbtouch->data, usbtouch->data_size, usbtouch_irq, usbtouch, endpoint->bInterval);else usb_fill_bulk_urb (usbtouch->irq, udev,usb_rcvbulkpipe (udev, endpoint->bEndpointAddress), - usbtouch->data, type->rept_size, + usbtouch->data, usbtouch->data_size, usbtouch_irq, usbtouch); usbtouch->irq->dev = udev;
drivers/md/dm-bufio.c +5 -0
@@ -1660,6 +1660,11 @@ static int __init dm_bufio_init(void) {__u64 mem; + dm_bufio_allocated_kmem_cache =0 ; + dm_bufio_allocated_get_free_pages =0 ; + dm_bufio_allocated_vmalloc =0 ; + dm_bufio_current_allocated =0 ; +memset (&dm_bufio_caches,0 ,sizeof dm_bufio_caches);memset (&dm_bufio_cache_names,0 ,sizeof dm_bufio_cache_names);
drivers/md/dm-delay.c +11 -12
@@ -20,6 +20,7 @@struct delay_c {struct timer_list delay_timer;struct mutex timer_lock; +struct workqueue_struct *kdelayd_wq;struct work_struct flush_expired_bios;struct list_head delayed_bios;atomic_t may_delay;
@@ -45,14 +46,13 @@ struct dm_delay_info {static DEFINE_MUTEX (delayed_bios_lock); -static struct workqueue_struct *kdelayd_wq;static struct kmem_cache *delayed_cache;static void handle_delayed_timer (unsigned long data) {struct delay_c *dc = (struct delay_c *)data; -queue_work (kdelayd_wq, &dc->flush_expired_bios); +queue_work (dc->kdelayd_wq, &dc->flush_expired_bios); }static void queue_timeout (struct delay_c *dc,unsigned long expires)
@@ -191,6 +191,12 @@ out: goto bad_dev_write; } + dc->kdelayd_wq =alloc_workqueue ("kdelayd" ,WQ_MEM_RECLAIM ,0 ); +if (!dc->kdelayd_wq) { +DMERR ("Couldn't start kdelayd" ); + goto bad_queue; + } +setup_timer (&dc->delay_timer, handle_delayed_timer, (unsigned long )dc);INIT_WORK (&dc->flush_expired_bios, flush_expired_bios);
@@ -203,6 +209,8 @@ out: ti->private = dc;return 0 ; +bad_queue: +mempool_destroy (dc->delayed_pool); bad_dev_write:if (dc->dev_write)dm_put_device (ti, dc->dev_write);
@@ -217,7 +225,7 @@ static void delay_dtr(struct dm_target *ti) {struct delay_c *dc = ti->private; -flush_workqueue (kdelayd_wq); +destroy_workqueue (dc->kdelayd_wq);dm_put_device (ti, dc->dev_read);
@@ -350,12 +358,6 @@ static int __init dm_delay_init(void) {int r = -ENOMEM ; - kdelayd_wq =alloc_workqueue ("kdelayd" ,WQ_MEM_RECLAIM ,0 ); -if (!kdelayd_wq) { -DMERR ("Couldn't start kdelayd" ); - goto bad_queue; - } - delayed_cache =KMEM_CACHE (dm_delay_info,0 );if (!delayed_cache) {DMERR ("Couldn't create delayed bio cache." );
@@ -373,8 +375,6 @@ static int __init dm_delay_init(void) bad_register:kmem_cache_destroy (delayed_cache); bad_memcache: -destroy_workqueue (kdelayd_wq); -bad_queue:return r; }
@@ -382,7 +382,6 @@ static void __exit dm_delay_exit(void) {dm_unregister_target (&delay_target);kmem_cache_destroy (delayed_cache); -destroy_workqueue (kdelayd_wq); }/* Module hooks */
drivers/md/dm-snap.c +64 -7
114 lines not on this page · raw message
drivers/md/dm-table.c +5 -0
@@ -215,6 +215,11 @@ int dm_table_create(struct dm_table **result, fmode_t mode, num_targets =dm_round_up (num_targets,KEYS_PER_NODE ); +if (!num_targets) { +kfree (t); +return -ENOMEM ; + } +if (alloc_targets (t, num_targets)) {kfree (t);return -ENOMEM ;
drivers/md/dm-thin.c +3 -1
@@ -640,7 +640,9 @@ static void process_prepared_mapping(struct dm_thin_new_mapping *m)*/ r =dm_thin_insert_block (tc->td, m->virt_block, m->data_block);if (r) { -DMERR_LIMIT ("dm_thin_insert_block() failed" ); +DMERR_LIMIT ("%s: dm_thin_insert_block() failed: error = %d" , +dm_device_name (pool->pool_md), r); +set_pool_mode (pool,PM_READ_ONLY );cell_error (pool, m->cell); goto out; }
drivers/md/persistent-data/dm-array.c +9 -1
@@ -317,8 +317,16 @@ static int shadow_ablock(struct dm_array_info *info, dm_block_t *root,* The shadow op will often be a noop. Only insert if it really * copied data. */ -if (dm_block_location (*block) != b) +if (dm_block_location (*block) != b) { +/* +* dm_tm_shadow_block will have already decremented the old +* block, but it is still referenced by the btree. We +* increment to stop the insert decrementing it below zero +* when overwriting the old value. +*/ +dm_tm_inc (info->btree_info.tm, b); r =insert_ablock (info, index, *block, root); + }return r; }
drivers/md/persistent-data/dm-space-map-metadata.c +6 -2
@@ -384,12 +384,16 @@ static int sm_metadata_new_block(struct dm_space_map *sm, dm_block_t *b) struct sm_metadata *smm = container_of(sm, struct sm_metadata, sm);int r =sm_metadata_new_block_ (sm, b); -if (r) +if (r) {DMERR ("unable to allocate new metadata block" ); +return r; + } r =sm_metadata_get_nr_free (sm, &count); -if (r) +if (r) {DMERR ("couldn't get free block count" ); +return r; + }check_threshold (&smm->threshold, count);
drivers/media/dvb-frontends/af9033.c +6 -6
@@ -170,18 +170,18 @@ static int af9033_rd_reg_mask(struct af9033_state *state, u32 reg, u8 *val,static int af9033_wr_reg_val_tab (struct af9033_state *state,const struct reg_val *tab,int tab_len) { +#define MAX_TAB_LEN 212int ret, i, j; -u8 buf[MAX_XFER_SIZE ]; +u8 buf[1 +MAX_TAB_LEN ]; + +dev_dbg (&state->i2c->dev,"%s: tab_len=%d\n" , __func__, tab_len);if (tab_len >sizeof (buf)) { -dev_warn (&state->i2c->dev, -"%s: i2c wr len=%d is too big!\n" , -KBUILD_MODNAME , tab_len); +dev_warn (&state->i2c->dev,"%s: tab len %d is too big\n" , +KBUILD_MODNAME , tab_len);return -EINVAL ; } -dev_dbg (&state->i2c->dev,"%s: tab_len=%d\n" , __func__, tab_len); -for (i =0 , j =0 ; i < tab_len; i++) { buf[j] = tab[i].val;
drivers/media/dvb-frontends/cxd2820r_core.c +2 -2
@@ -34,7 +34,7 @@ static int cxd2820r_wr_regs_i2c(struct cxd2820r_priv *priv, u8 i2c, u8 reg, { .addr = i2c, .flags = 0, - .len = sizeof(buf), + .len = len + 1, .buf = buf, } };
@@ -75,7 +75,7 @@ static int cxd2820r_rd_regs_i2c(struct cxd2820r_priv *priv, u8 i2c, u8 reg, }, { .addr = i2c, .flags = I2C_M_RD, - .len = sizeof(buf), + .len = len, .buf = buf, } };
drivers/media/i2c/wm8775.c +1 -3
@@ -131,12 +131,10 @@ static int wm8775_s_routing(struct v4l2_subdev *sd,return -EINVAL ; } state->input = input; -if (!v4l2_ctrl_g_ctrl (state->mute)) +if (v4l2_ctrl_g_ctrl (state->mute))return 0 ;if (!v4l2_ctrl_g_ctrl (state->vol))return 0 ; -if (!v4l2_ctrl_g_ctrl (state->bal)) -return 0 ;wm8775_set_audio (sd,1 );return 0 ; }
drivers/media/pci/bt8xx/bttv-driver.c +2 -1
@@ -4226,7 +4226,8 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id) } btv->std =V4L2_STD_PAL ;init_irqreg (btv); -v4l2_ctrl_handler_setup (hdl); +if (!bttv_tvcards[btv->c.type].no_video) +v4l2_ctrl_handler_setup (hdl);if (hdl->error) { result = hdl->error; goto fail2;
drivers/media/pci/saa7164/saa7164-core.c +3 -1
@@ -1348,9 +1348,11 @@ static int saa7164_initdev(struct pci_dev *pci_dev,if (fw_debug) { dev->kthread =kthread_run (saa7164_thread_function, dev,"saa7164 debug" ); -if (!dev->kthread) +if (IS_ERR (dev->kthread)) { + dev->kthread =NULL ;printk (KERN_ERR "%s() Failed to create " "debug kernel thread\n" , __func__); + } } }/* != BOARD_UNKNOWN */
drivers/media/usb/dvb-usb-v2/af9035.c +11 -6
@@ -130,7 +130,7 @@ static int af9035_wr_regs(struct dvb_usb_device *d, u32 reg, u8 *val, int len) {u8 wbuf[MAX_XFER_SIZE ];u8 mbox = (reg >>16 ) &0xff ; -struct usb_req req = {CMD_MEM_WR , mbox,sizeof (wbuf), wbuf,0 ,NULL }; +struct usb_req req = {CMD_MEM_WR , mbox,6 + len, wbuf,0 ,NULL };if (6 + len >sizeof (wbuf)) { dev_warn(&d->udev->dev, "%s: i2c wr: len=%d is too big!\n",
@@ -237,14 +237,15 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap, }else {/* I2C */ u8 buf[MAX_XFER_SIZE ]; -struct usb_req req = {CMD_I2C_RD ,0 ,sizeof (buf), +struct usb_req req = {CMD_I2C_RD ,0 ,5 + msg[0 ].len, buf, msg[1 ].len, msg[1 ].buf };if (5 + msg[0 ].len >sizeof (buf)) {dev_warn (&d->udev->dev,"%s: i2c xfer: len=%d is too big!\n" ,KBUILD_MODNAME , msg[0 ].len); -return -EOPNOTSUPP ; + ret = -EOPNOTSUPP ; + goto unlock; } req.mbox |= ((msg[0 ].addr &0x80 ) >>3 ); buf[0 ] = msg[1 ].len;
@@ -273,14 +274,15 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap, }else {/* I2C */ u8 buf[MAX_XFER_SIZE ]; -struct usb_req req = {CMD_I2C_WR ,0 ,sizeof (buf), buf, -0 ,NULL }; +struct usb_req req = {CMD_I2C_WR ,0 ,5 + msg[0 ].len, + buf,0 ,NULL };if (5 + msg[0 ].len >sizeof (buf)) {dev_warn (&d->udev->dev,"%s: i2c xfer: len=%d is too big!\n" ,KBUILD_MODNAME , msg[0 ].len); -return -EOPNOTSUPP ; + ret = -EOPNOTSUPP ; + goto unlock; } req.mbox |= ((msg[0 ].addr &0x80 ) >>3 ); buf[0 ] = msg[0 ].len;
@@ -300,6 +302,7 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap, ret = -EOPNOTSUPP ; } +unlock:mutex_unlock (&d->i2c_mutex);if (ret <0 )
@@ -1512,6 +1515,8 @@ static const struct usb_device_id af9035_id_table[] = {/* XXX: that same ID [0ccd:0099] is used by af9015 driver too */ {DVB_USB_DEVICE (USB_VID_TERRATEC ,0x0099 , &af9035_props, "TerraTec Cinergy T Stick Dual RC (rev. 2)", NULL) }, + { DVB_USB_DEVICE(USB_VID_LEADTEK, 0x6a05, + &af9035_props, "Leadtek WinFast DTV Dongle Dual", NULL) }, { } };MODULE_DEVICE_TABLE (usb, af9035_id_table);
drivers/net/ethernet/intel/igb/e1000_phy.c +4 -1
@@ -1595,7 +1595,10 @@ s32 igb_phy_has_link(struct e1000_hw *hw, u32 iterations,* ownership of the resources, wait and try again to * see if they have relinquished the resources yet. */ -udelay (usec_interval); +if (usec_interval >=1000 ) +mdelay (usec_interval/1000 ); +else +udelay (usec_interval); } ret_val = hw->phy.ops.read_reg (hw,PHY_STATUS , &phy_status);if (ret_val)
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +12 -10
@@ -3937,18 +3937,20 @@ static void ar9003_hw_quick_drop_apply(struct ath_hw *ah, u16 freq)int quick_drop;s32 t[3 ], f[3 ] = {5180 ,5500 ,5785 }; -if (!(pBase->miscConfiguration &BIT (1 ))) +if (!(pBase->miscConfiguration &BIT (4 )))return ; -if (freq <4000 ) - quick_drop = eep->modalHeader2G.quick_drop; -else { - t[0 ] = eep->base_ext1.quick_drop_low; - t[1 ] = eep->modalHeader5G.quick_drop; - t[2 ] = eep->base_ext1.quick_drop_high; - quick_drop =ar9003_hw_power_interpolate (freq, f, t,3 ); +if (AR_SREV_9300 (ah) ||AR_SREV_9580 (ah) ||AR_SREV_9340 (ah)) { +if (freq <4000 ) { + quick_drop = eep->modalHeader2G.quick_drop; + }else { + t[0 ] = eep->base_ext1.quick_drop_low; + t[1 ] = eep->modalHeader5G.quick_drop; + t[2 ] = eep->base_ext1.quick_drop_high; + quick_drop =ar9003_hw_power_interpolate (freq, f, t,3 ); + } +REG_RMW_FIELD (ah,AR_PHY_AGC ,AR_PHY_AGC_QUICK_DROP , quick_drop); } -REG_RMW_FIELD (ah,AR_PHY_AGC ,AR_PHY_AGC_QUICK_DROP , quick_drop); }static void ar9003_hw_txend_to_xpa_off_apply (struct ath_hw *ah,bool is2ghz)
@@ -3988,7 +3990,7 @@ static void ar9003_hw_xlna_bias_strength_apply(struct ath_hw *ah, bool is2ghz)struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;u8 bias; -if (!(eep->baseEepHeader.featureEnable &0x40 )) +if (!(eep->baseEepHeader.miscConfiguration &0x40 ))return ;if (!AR_SREV_9300 (ah))
drivers/net/wireless/iwlwifi/mvm/debugfs.c +4 -0
@@ -119,6 +119,10 @@ static ssize_t iwl_dbgfs_sta_drain_write(struct file *file,if (sscanf (buf,"%d %d" , &sta_id, &drain) !=2 )return -EINVAL ; +if (sta_id <0 || sta_id >=IWL_MVM_STATION_COUNT ) +return -EINVAL ; +if (drain <0 || drain >1 ) +return -EINVAL ;mutex_lock (&mvm->mutex);
drivers/net/wireless/mwifiex/sta_ioctl.c +2 -2
@@ -309,8 +309,8 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,if (bss_desc && bss_desc->ssid.ssid_len && (!mwifiex_ssid_cmp (&priv->curr_bss_params.bss_descriptor. ssid, &bss_desc->ssid))) { -kfree (bss_desc); -return 0 ; + ret =0 ; + goto done; }/* Exit Adhoc mode first */
drivers/pci/pci-driver.c +9 -3
@@ -19,6 +19,7 @@#include <linux/cpu.h> #include <linux/pm_runtime.h> #include <linux/suspend.h> +#include <linux/kexec.h> #include "pci.h" struct pci_dynid {
@@ -388,12 +389,17 @@ static void pci_device_shutdown(struct device *dev)pci_msi_shutdown (pci_dev);pci_msix_shutdown (pci_dev); +#ifdef CONFIG_KEXEC /* -* Turn off Bus Master bit on the device to tell it to not -* continue to do DMA. Don't touch devices in D3cold or unknown states. +* If this is a kexec reboot, turn off Bus Master bit on the +* device to tell it to not continue to do DMA. Don't touch +* devices in D3cold or unknown states. +* If it is not a kexec reboot, firmware will hit the PCI +* devices with big hammer and stop their DMA any way. */ -if (pci_dev->current_state <= PCI_D3hot) +if (kexec_in_progress && (pci_dev->current_state <= PCI_D3hot))pci_clear_master (pci_dev); +#endif }#ifdef CONFIG_PM
drivers/rtc/rtc-at91rm9200.c +2 -0
@@ -221,6 +221,8 @@ static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) at91_alarm_year = tm.tm_year; + tm.tm_mon = alrm->time.tm_mon; + tm.tm_mday = alrm->time.tm_mday; tm.tm_hour = alrm->time.tm_hour; tm.tm_min = alrm->time.tm_min; tm.tm_sec = alrm->time.tm_sec;
drivers/staging/comedi/drivers/amplc_pc263.c +3 -0
@@ -72,6 +72,9 @@ static int pc263_do_insn_bits(struct comedi_device *dev,outb (s->state &0xFF , dev->iobase);outb (s->state >>8 , dev->iobase +1 ); } + + data[1 ] = s->state; +return insn->n; }
drivers/staging/comedi/drivers/amplc_pci263.c +3 -0
@@ -59,6 +59,9 @@ static int pci263_do_insn_bits(struct comedi_device *dev,outb (s->state &0xFF , dev->iobase);outb (s->state >>8 , dev->iobase +1 ); } + + data[1 ] = s->state; +return insn->n; }
drivers/staging/comedi/drivers/pcmuio.c +6 -5
@@ -935,12 +935,13 @@ static void pcmuio_detach(struct comedi_device *dev)struct pcmuio_private *devpriv = dev->private;int i; -for (i =0 ; i <MAX_ASICS ; ++i) { -if (devpriv->asics[i].irq) -free_irq (devpriv->asics[i].irq, dev); - } -if (devpriv && devpriv->sprivs) +if (devpriv) { +for (i =0 ; i <MAX_ASICS ; ++i) { +if (devpriv->asics[i].irq) +free_irq (devpriv->asics[i].irq, dev); + }kfree (devpriv->sprivs); + }comedi_legacy_detach (dev); }
drivers/staging/comedi/drivers/ssv_dnp.c +3 -3
@@ -87,11 +87,11 @@ static int dnp_dio_insn_bits(struct comedi_device *dev,/* on return, data[1] contains the value of the digital input lines. */ outb (PADR ,CSCIR ); - data[0 ] =inb (CSCDR ); + data[1 ] =inb (CSCDR );outb (PBDR ,CSCIR ); - data[0 ] +=inb (CSCDR ) <<8 ; + data[1 ] +=inb (CSCDR ) <<8 ;outb (PCDR ,CSCIR ); - data[0 ] += ((inb (CSCDR ) &0xF0 ) <<12 ); + data[1 ] += ((inb (CSCDR ) &0xF0 ) <<12 );return insn->n;
drivers/usb/core/hub.c +3 -2
@@ -4808,8 +4808,9 @@ static void hub_events(void) hub->ports[i -1 ]->child;dev_dbg (hub_dev,"warm reset port %d\n" , i); -if (!udev || !(portstatus & -USB_PORT_STAT_CONNECTION )) { +if (!udev || + !(portstatus &USB_PORT_STAT_CONNECTION ) || + udev->state ==USB_STATE_NOTATTACHED ) { status =hub_port_reset (hub, i,NULL ,HUB_BH_RESET_TIME , true);
drivers/usb/dwc3/ep0.c +2 -0
@@ -478,6 +478,8 @@ static int dwc3_ep0_handle_feature(struct dwc3 *dwc, dep =dwc3_wIndex_to_dep (dwc, wIndex);if (!dep)return -EINVAL ; +if (set ==0 && (dep->flags &DWC3_EP_WEDGE )) +break ; ret =__dwc3_gadget_ep_set_halt (dep, set);if (ret)return -EINVAL ;
drivers/usb/dwc3/gadget.c +1 -4
@@ -1220,9 +1220,6 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value)else dep->flags |=DWC3_EP_STALL ; }else { -if (dep->flags &DWC3_EP_WEDGE ) -return 0 ; - ret =dwc3_send_gadget_ep_cmd (dwc, dep->number,DWC3_DEPCMD_CLEARSTALL , ¶ms);if (ret)
@@ -1230,7 +1227,7 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value) value ?"set" :"clear" , dep->name); else - dep->flags &= ~DWC3_EP_STALL; + dep->flags &= ~(DWC3_EP_STALL | DWC3_EP_WEDGE); }return ret;
drivers/usb/gadget/composite.c +1 -0
@@ -593,6 +593,7 @@ static void reset_config(struct usb_composite_dev *cdev)bitmap_zero (f->endpoints,32 ); } cdev->config =NULL ; + cdev->delayed_status =0 ; } static int set_config(struct usb_composite_dev *cdev,
drivers/usb/serial/option.c +27 -0
@@ -85,6 +85,7 @@ static void option_instat_callback(struct urb *urb);#define HUAWEI_PRODUCT_K4505 0x1464#define HUAWEI_PRODUCT_K3765 0x1465#define HUAWEI_PRODUCT_K4605 0x14C6 +#define HUAWEI_PRODUCT_E173S6 0x1C07#define QUANTA_VENDOR_ID 0x0408#define QUANTA_PRODUCT_Q101 0xEA02
@@ -572,6 +573,8 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c23, USB_CLASS_COMM, 0x02, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t) &net_intf1_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173S6, 0xff, 0xff, 0xff), + .driver_info = (kernel_ulong_t) &net_intf1_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1750, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t) &net_intf2_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1441, USB_CLASS_COMM, 0x02, 0xff) },
@@ -634,6 +637,10 @@ static const struct usb_device_id option_ids[] = { { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x6D) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x6E) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x6F) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x72) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x73) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x74) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x75) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x78) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x79) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x7A) },
@@ -688,6 +695,10 @@ static const struct usb_device_id option_ids[] = { { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x6D) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x6E) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x6F) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x72) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x73) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x74) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x75) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x78) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x79) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7A) },
@@ -742,6 +753,10 @@ static const struct usb_device_id option_ids[] = { { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6D) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6E) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x6F) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x72) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x73) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x74) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x75) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x78) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x79) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x03, 0x7A) },
@@ -796,6 +811,10 @@ static const struct usb_device_id option_ids[] = { { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6D) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6E) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x6F) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x72) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x73) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x74) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x75) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x78) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x79) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x04, 0x7A) },
@@ -850,6 +869,10 @@ static const struct usb_device_id option_ids[] = { { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6D) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6E) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x6F) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x72) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x73) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x74) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x75) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x78) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x79) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x05, 0x7A) },
@@ -904,6 +927,10 @@ static const struct usb_device_id option_ids[] = { { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6D) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6E) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x6F) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x72) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x73) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x74) }, + { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x75) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x78) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x79) }, { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x7A) },
drivers/watchdog/sc1200wdt.c +2 -1
@@ -409,8 +409,9 @@ static int __init sc1200wdt_init(void)#if definedCONFIG_PNP /* now that the user has specified an IO port and we haven't detected * any devices, disable pnp support */ +if (isapnp) +pnp_unregister_driver (&scl200wdt_pnp_driver); isapnp =0 ; -pnp_unregister_driver (&scl200wdt_pnp_driver);#endif if (!request_region (io, io_len,SC1200_MODULE_NAME )) {
fs/btrfs/acl.c +1 -1
@@ -229,7 +229,7 @@ int btrfs_init_acl(struct btrfs_trans_handle *trans,if (ret >0 ) {/* we need an acl */ ret =btrfs_set_acl (trans, inode, acl,ACL_TYPE_ACCESS ); - }else { + }else if (ret <0 ) {cache_no_acl (inode); } }else {
fs/btrfs/inode.c +28 -19
98 lines not on this page · raw message
fs/btrfs/ioctl.c +2 -1
@@ -2093,7 +2093,7 @@ static noinline int btrfs_ioctl_snap_destroy(struct file *file, err =mutex_lock_killable_nested (&dir->i_mutex,I_MUTEX_PARENT );if (err == -EINTR ) - goto out; + goto out_drop_write; dentry =lookup_one_len (vol_args->name, parent, namelen);if (IS_ERR (dentry)) { err =PTR_ERR (dentry);
@@ -2235,6 +2235,7 @@ out_dput:dput (dentry); out_unlock_dir:mutex_unlock (&dir->i_mutex); +out_drop_write:mnt_drop_write_file (file); out:kfree (vol_args);
fs/btrfs/send.c +2 -2
@@ -4623,8 +4623,8 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_) }if (!access_ok (VERIFY_READ , arg->clone_sources, -sizeof (*arg->clone_sources * - arg->clone_sources_count))) { +sizeof (*arg->clone_sources) * + arg->clone_sources_count)) { ret = -EFAULT ; goto out; }
fs/btrfs/tree-log.c +1 -1
@@ -3314,7 +3314,7 @@ static int log_one_extent(struct btrfs_trans_handle *trans,btrfs_set_token_file_extent_type (leaf, fi,BTRFS_FILE_EXTENT_REG , &token); -if (em->block_start ==0 ) +if (em->block_start ==EXTENT_MAP_HOLE ) skip_csum = true; }
fs/btrfs/volumes.c +2 -0
@@ -4248,6 +4248,7 @@ int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len)btrfs_emerg (fs_info,"Invalid mapping for %Lu-%Lu, got " "%Lu-%Lu\n" , logical, logical+len, em->start, em->start + em->len); +free_extent_map (em);return 1 ; }
@@ -4429,6 +4430,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw,btrfs_crit (fs_info,"found a bad mapping, wanted %Lu, " "found %Lu-%Lu\n" , logical, em->start, em->start + em->len); +free_extent_map (em);return -EINVAL ; }
fs/nfs/blocklayout/extents.c +1 -1
@@ -44,7 +44,7 @@static inline sector_t normalize (sector_t s,int base) {sector_t tmp = s;/* Since do_div modifies its argument */ -return s -do_div (tmp, base); +return s -sector_div (tmp, base); }static inline sector_t normalize_up (sector_t s,int base)
fs/nfs/nfs4proc.c +1 -2
@@ -4222,8 +4222,7 @@ nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server,dprintk ("%s ERROR %d, Reset session\n" , __func__, task->tk_status);nfs4_schedule_session_recovery (clp->cl_session, task->tk_status); - task->tk_status =0 ; -return -EAGAIN ; + goto wait_on_recovery;#endif /* CONFIG_NFS_V4_1 */ case -NFS4ERR_DELAY :nfs_inc_server_stats (server,NFSIOS_DELAY );
fs/nfsd/nfscache.c +8 -1
@@ -129,6 +129,13 @@ nfsd_reply_cache_alloc(void) }static void +nfsd_reply_cache_unhash (struct svc_cacherep *rp) +{ +hlist_del_init (&rp->c_hash); +list_del_init (&rp->c_lru); +} + +static void nfsd_reply_cache_free_locked (struct svc_cacherep *rp) {if (rp->c_type ==RC_REPLBUFF && rp->c_replvec.iov_base) {
@@ -403,7 +410,7 @@ nfsd_cache_lookup(struct svc_rqst *rqstp) rp = list_first_entry(&lru_head, struct svc_cacherep, c_lru);if (nfsd_cache_entry_expired (rp) || num_drc_entries >= max_drc_entries) { -lru_put_end (rp); +nfsd_reply_cache_unhash (rp);prune_cache_entries (); goto search_cache; }
fs/xfs/xfs_fsops.c +5 -1
@@ -216,6 +216,8 @@ xfs_growfs_data_private(*/ nfree =0 ;for (agno = nagcount -1 ; agno >= oagcount; agno--, new -= agsize) { +__be32 *agfl_bno; +/* * AG freespace header block */
@@ -275,8 +277,10 @@ xfs_growfs_data_private( agfl->agfl_seqno =cpu_to_be32 (agno);uuid_copy (&agfl->agfl_uuid, &mp->m_sb.sb_uuid); } + + agfl_bno =XFS_BUF_TO_AGFL_BNO (mp, bp);for (bucket =0 ; bucket <XFS_AGFL_SIZE (mp); bucket++) - agfl->agfl_bno[bucket] =cpu_to_be32 (NULLAGBLOCK ); + agfl_bno[bucket] =cpu_to_be32 (NULLAGBLOCK ); error =xfs_bwrite (bp);xfs_buf_relse (bp);
fs/xfs/xfs_ioctl.c +2 -1
@@ -409,7 +409,8 @@ xfs_attrlist_by_handle(return -XFS_ERROR (EPERM );if (copy_from_user (&al_hreq, arg,sizeof (xfs_fsop_attrlist_handlereq_t)))return -XFS_ERROR (EFAULT ); -if (al_hreq.buflen >XATTR_LIST_MAX ) +if (al_hreq.buflen <sizeof (struct attrlist ) || + al_hreq.buflen >XATTR_LIST_MAX )return -XFS_ERROR (EINVAL );/*
fs/xfs/xfs_ioctl32.c +2 -1
@@ -359,7 +359,8 @@ xfs_compat_attrlist_by_handle(if (copy_from_user (&al_hreq, arg,sizeof (compat_xfs_fsop_attrlist_handlereq_t)))return -XFS_ERROR (EFAULT ); -if (al_hreq.buflen >XATTR_LIST_MAX ) +if (al_hreq.buflen <sizeof (struct attrlist ) || + al_hreq.buflen >XATTR_LIST_MAX )return -XFS_ERROR (EINVAL );/*
include/linux/compiler-intel.h +0 -2
@@ -28,8 +28,6 @@#endif -#define uninitialized_var (x) x -#ifndef __HAVE_BUILTIN_BSWAP16__/* icc has this, but it's called _bswap16 */ #define __HAVE_BUILTIN_BSWAP16__
include/linux/kexec.h +3 -0
@@ -198,6 +198,9 @@ extern u32 vmcoreinfo_note[VMCOREINFO_NOTE_SIZE/4];extern size_t vmcoreinfo_size;extern size_t vmcoreinfo_max_size; +/* flag to track if kexec reboot is in progress */ +extern bool kexec_in_progress; +int __init parse_crashkernel (char *cmdline,unsigned long long system_ram,unsigned long long *crash_size,unsigned long long *crash_base); int parse_crashkernel_high(char *cmdline, unsigned long long system_ram,
include/sound/memalloc.h +1 -1
@@ -103,7 +103,7 @@ static inline dma_addr_t snd_sgbuf_get_addr(struct snd_dma_buffer *dmab, {struct snd_sg_buf *sgbuf = dmab->private_data;dma_addr_t addr = sgbuf->table[offset >>PAGE_SHIFT ].addr; - addr &=PAGE_MASK ; + addr &= ~((dma_addr_t )PAGE_SIZE -1 );return addr + offset %PAGE_SIZE ; }
include/uapi/sound/compress_offload.h +3 -3
@@ -30,7 +30,7 @@#include <sound/compress_params.h> -#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 1, 1) +#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 1, 2)/** * struct snd_compressed_buffer: compressed buffer * @fragment_size: size of buffer fragment in bytes
@@ -67,8 +67,8 @@ struct snd_compr_params {struct snd_compr_tstamp {__u32 byte_offset;__u32 copied_total; -snd_pcm_uframes_t pcm_frames; -snd_pcm_uframes_t pcm_io_frames; +__u32 pcm_frames; +__u32 pcm_io_frames;__u32 sampling_rate; };
kernel/futex.c +1 -1
@@ -287,7 +287,7 @@ again:put_page (page);/* serialize against __split_huge_page_splitting() */ local_irq_disable (); -if (likely (__get_user_pages_fast (address,1 ,1 , &page) ==1 )) { +if (likely (__get_user_pages_fast (address,1 , !ro, &page) ==1 )) { page_head =compound_head (page);/* * page_head is valid pointer but we must pin
kernel/kexec.c +4 -0
@@ -47,6 +47,9 @@ u32 vmcoreinfo_note[VMCOREINFO_NOTE_SIZE/4];size_t vmcoreinfo_size;size_t vmcoreinfo_max_size =sizeof (vmcoreinfo_data); +/* Flag to indicate we are going to kexec a new kernel */ +bool kexec_in_progress = false; +/* Location of the reserved area for the crash kernel */ struct resource crashk_res = { .name ="Crash kernel" ,
@@ -1678,6 +1681,7 @@ int kernel_kexec(void) } else#endif { + kexec_in_progress = true;kernel_restart_prepare (NULL );printk (KERN_EMERG "Starting new kernel\n" );machine_shutdown ();
kernel/sched/debug.c +8 -0
@@ -224,6 +224,14 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)SEQ_printf (m," .%-30s: %d\n" ,"tg->runnable_avg" ,atomic_read (&cfs_rq->tg->runnable_avg));#endif +#ifdef CONFIG_CFS_BANDWIDTH +SEQ_printf (m," .%-30s: %d\n" ,"tg->cfs_bandwidth.timer_active" , + cfs_rq->tg->cfs_bandwidth.timer_active); +SEQ_printf (m," .%-30s: %d\n" ,"throttled" , + cfs_rq->throttled); +SEQ_printf (m," .%-30s: %d\n" ,"throttle_count" , + cfs_rq->throttle_count); +#endif print_cfs_group_stats (m, cpu, cfs_rq->tg);#endif
kernel/sched/fair.c +2 -0
@@ -2288,6 +2288,8 @@ static void throttle_cfs_rq(struct cfs_rq *cfs_rq) cfs_rq->throttled_clock = rq->clock;raw_spin_lock (&cfs_b->lock);list_add_tail_rcu (&cfs_rq->throttled_list, &cfs_b->throttled_cfs_rq); +if (!cfs_b->timer_active) +__start_cfs_bandwidth (cfs_b);raw_spin_unlock (&cfs_b->lock); }
net/ipv4/udp.c +0 -3
@@ -1073,9 +1073,6 @@ int udp_sendpage(struct sock *sk, struct page *page, int offset,if (flags &MSG_SENDPAGE_NOTLAST ) flags |=MSG_MORE ; -if (flags &MSG_SENDPAGE_NOTLAST ) - flags |=MSG_MORE ; -if (!up->pending) {struct msghdr msg = { .msg_flags = flags|MSG_MORE };
net/ipv6/ip6_tunnel.c +0 -2
@@ -1711,8 +1711,6 @@ static void __net_exit ip6_tnl_destroy_tunnels(struct ip6_tnl_net *ip6n) } } - t =rtnl_dereference (ip6n->tnls_wc[0 ]); -unregister_netdevice_queue (t->dev, &list);unregister_netdevice_many (&list); }
net/mac80211/cfg.c +1 -2
@@ -2356,8 +2356,7 @@ static int ieee80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev);struct ieee80211_local *local =wdev_priv (dev->ieee80211_ptr); -if (sdata->vif.type !=NL80211_IFTYPE_STATION && - sdata->vif.type !=NL80211_IFTYPE_MESH_POINT ) +if (sdata->vif.type !=NL80211_IFTYPE_STATION )return -EOPNOTSUPP ;if (!(local->hw.flags &IEEE80211_HW_SUPPORTS_PS ))
net/mac80211/rx.c +2 -1
@@ -864,7 +864,8 @@ static void ieee80211_rx_reorder_ampdu(struct ieee80211_rx_data *rx,u16 sc;u8 tid, ack_policy; -if (!ieee80211_is_data_qos (hdr->frame_control)) +if (!ieee80211_is_data_qos (hdr->frame_control) || +is_multicast_ether_addr (hdr->addr1)) goto dont_reorder;/*
security/selinux/hooks.c +76 -17
144 lines not on this page · raw message
sound/pci/hda/hda_generic.c +46 -1
71 lines not on this page · raw message
sound/pci/hda/hda_generic.h +3 -0
@@ -241,6 +241,9 @@ struct hda_gen_spec {const struct badness_table *main_out_badness;const struct badness_table *extra_out_badness; +/* preferred pin/DAC pairs; an array of paired NIDs */ +const hda_nid_t *preferred_dacs; +/* loopback mixing mode */ bool aamix_mode;
sound/pci/hda/patch_analog.c +10 -0
@@ -1227,6 +1227,14 @@ static int ad1986a_parse_auto_config(struct hda_codec *codec) {int err;struct ad198x_spec *spec; +static hda_nid_t preferred_pairs[] = { +0x1a ,0x03 , +0x1b ,0x03 , +0x1c ,0x04 , +0x1d ,0x05 , +0x1e ,0x03 , +0 + }; err =alloc_ad_spec (codec);if (err <0 )
@@ -1247,6 +1255,8 @@ static int ad1986a_parse_auto_config(struct hda_codec *codec)* So, let's disable the shared stream. */ spec->gen.multiout.no_share_stream =1 ; +/* give fixed DAC/pin pairs */ + spec->gen.preferred_dacs = preferred_pairs;snd_hda_pick_fixup (codec,NULL , ad1986a_fixup_tbl, ad1986a_fixups);snd_hda_apply_fixup (codec,HDA_FIXUP_ACT_PRE_PROBE );
sound/pci/hda/patch_hdmi.c +3 -2
@@ -2001,8 +2001,9 @@ static int simple_playback_build_controls(struct hda_codec *codec)int err; per_cvt =get_cvt (spec,0 ); - err =snd_hda_create_spdif_out_ctls (codec, per_cvt->cvt_nid, - per_cvt->cvt_nid); + err =snd_hda_create_dig_out_ctls (codec, per_cvt->cvt_nid, + per_cvt->cvt_nid, +HDA_PCM_TYPE_HDMI );if (err <0 )return err;return simple_hdmi_build_jack (codec,0 );
virt/kvm/kvm_main.c +3 -0
@@ -1904,6 +1904,9 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id)int r;struct kvm_vcpu *vcpu, *v; +if (id >=KVM_MAX_VCPUS ) +return -EINVAL ; + vcpu =kvm_arch_vcpu_create (kvm, id);if (IS_ERR (vcpu))return PTR_ERR (vcpu);