Linux 4.6.1
Greg KH
maintainerI'm announcing the release of the 4.6.1 kernel.
All users of the 4.6 kernel series must upgrade.
The updated 4.6.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.6.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/serial/tty.txt | 3 Makefile | 7 - arch/arm/kvm/mmu.c | 17 +- arch/arm64/include/asm/pgtable-hwdef.h | 1 arch/arm64/include/asm/pgtable.h | 25 +++- arch/arm64/kernel/cpuinfo.c | 3 arch/arm64/kvm/inject_fault.c | 2 arch/arm64/mm/fault.c | 50 ++++++++ arch/mips/include/asm/kvm_host.h | 2 arch/mips/kvm/emulate.c | 89 ++++++++------- arch/mips/kvm/trap_emul.c | 2 arch/powerpc/kvm/book3s_hv.c | 1 arch/x86/crypto/sha-mb/sha1_x8_avx2.S | 13 +- arch/x86/events/intel/uncore.c | 2 arch/x86/include/asm/cpufeature.h | 12 +- arch/x86/include/asm/disabled-features.h | 6 - arch/x86/kernel/cpu/common.c | 4 arch/x86/kvm/mtrr.c | 2 arch/x86/kvm/vmx.c | 2 arch/x86/pci/xen.c | 7 - drivers/acpi/device_pm.c | 1 drivers/acpi/osl.c | 16 +- drivers/bluetooth/hci_vhci.c | 28 +++- drivers/clk/bcm/clk-bcm2835.c | 4 drivers/clk/qcom/gcc-msm8916.c | 2 drivers/crypto/caam/jr.c | 2 drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 10 + drivers/crypto/talitos.c | 64 +++++++++++ drivers/infiniband/ulp/srp/ib_srp.c | 16 +- drivers/input/misc/pwm-beeper.c | 69 ++++++++---- drivers/irqchip/irq-gic-v3.c | 19 +++ drivers/irqchip/irq-gic.c | 8 + drivers/mcb/mcb-parse.c | 2 drivers/md/md.c | 2 drivers/mfd/omap-usb-tll.c | 13 +- drivers/misc/mei/amthif.c | 4 drivers/misc/mei/bus.c | 15 ++ drivers/misc/mei/client.c | 4 drivers/misc/mei/hbm.c | 3 drivers/misc/mei/interrupt.c | 6 - drivers/misc/mei/mei_dev.h | 2 drivers/misc/mic/vop/vop_vringh.c | 5 drivers/mmc/card/block.c | 5 drivers/mmc/core/core.c | 4 drivers/mmc/core/mmc.c | 7 + drivers/mmc/host/sdhci-acpi.c | 13 +- drivers/mmc/host/sdhci-pci-core.c | 5 drivers/mtd/ubi/eba.c | 21 +++ drivers/mtd/ubi/fastmap.c | 1 drivers/mtd/ubi/ubi.h | 2 drivers/net/can/dev.c | 56 +++++++++ drivers/net/can/m_can/m_can.c | 2 drivers/net/usb/asix_common.c | 2 drivers/nfc/st21nfca/i2c.c | 6 - drivers/platform/x86/dell-rbtn.c | 56 +++++++++ drivers/scsi/scsi_scan.c | 1 drivers/scsi/scsi_sysfs.c | 6 - drivers/staging/comedi/drivers/das1800.c | 22 ++- drivers/thunderbolt/eeprom.c | 1 drivers/tty/n_gsm.c | 4 drivers/tty/n_hdlc.c | 4 drivers/tty/n_tty.c | 70 +++++------- drivers/tty/pty.c | 4 drivers/tty/serial/8250/8250_mid.c | 35 +++--- drivers/tty/serial/8250/8250_pci.c | 3 drivers/tty/serial/atmel_serial.c | 14 ++ drivers/tty/serial/samsung.c | 4 drivers/tty/tty_buffer.c | 34 +---- drivers/tty/vt/vt.c | 5 drivers/usb/core/driver.c | 40 ++++-- drivers/usb/core/hcd.c | 15 ++ drivers/usb/core/hub.c | 8 - drivers/usb/gadget/function/f_fs.c | 2 drivers/usb/gadget/function/f_mass_storage.c | 36 ++---- drivers/usb/gadget/function/f_mass_storage.h | 2 drivers/usb/gadget/legacy/acm_ms.c | 4 drivers/usb/gadget/legacy/mass_storage.c | 4 drivers/usb/gadget/legacy/multi.c | 12 -- drivers/usb/gadget/legacy/nokia.c | 7 - drivers/usb/gadget/udc/udc-core.c | 2 drivers/usb/host/Kconfig | 3 drivers/usb/misc/usbtest.c | 4 drivers/usb/serial/cp210x.c | 3 drivers/usb/serial/io_edgeport.c | 56 ++++++--- drivers/usb/serial/keyspan.c | 4 drivers/usb/serial/mxuport.c | 10 + drivers/usb/serial/option.c | 155 +++++++++++++++++++++++++-- drivers/usb/serial/quatech2.c | 1 drivers/watchdog/sp5100_tco.c | 15 +- drivers/watchdog/watchdog_dev.c | 1 fs/btrfs/ctree.h | 1 fs/btrfs/file.c | 29 +++-- fs/btrfs/inode.c | 2 fs/btrfs/ioctl.c | 21 +++ fs/cifs/sess.c | 139 +++++++++++++----------- fs/cifs/smb2glob.h | 1 fs/cifs/smb2inode.c | 8 + fs/cifs/smb2pdu.c | 16 ++ fs/cifs/smb2proto.h | 2 fs/crypto/keyinfo.c | 120 +++++++++++++------- fs/f2fs/f2fs.h | 8 + fs/f2fs/super.c | 13 ++ fs/hpfs/super.c | 42 +++++-- fs/nfs/callback_proc.c | 6 - include/asm-generic/qspinlock.h | 27 ++++ include/asm-generic/siginfo.h | 15 -- include/linux/can/dev.h | 22 +++ include/linux/fscrypto.h | 1 include/linux/signal.h | 15 ++ include/linux/tty.h | 2 include/linux/usb.h | 5 include/linux/usb/hcd.h | 1 include/scsi/scsi_device.h | 1 kernel/sched/loadavg.c | 11 + kernel/trace/ring_buffer.c | 35 +++--- scripts/Makefile.extrawarn | 1 sound/pci/hda/patch_realtek.c | 31 +++++ tools/objtool/Makefile | 4 tools/objtool/elf.h | 5 119 files changed, 1353 insertions(+), 547 deletions(-)
Adrian Hunter (4):
mmc: mmc: Fix partition switch timeout for some eMMCs
mmc: sdhci-acpi: Ensure connected devices are powered when probing
mmc: sdhci-acpi: Remove MMC_CAP_BUS_WIDTH_TEST for Intel controllers
mmc: sdhci-pci: Remove MMC_CAP_BUS_WIDTH_TEST for Intel controllers
Alan Stern (1):
USB: leave LPM alone if possible when binding/unbinding interface drivers
Alexander Usyskin (3):
mei: fix NULL dereferencing during FW initiated disconnection
mei: amthif: discard not read messages
mei: bus: call mei_cl_read_start under device lock
Alexandre Belloni (1):
tty/serial: atmel: fix hardware handshake selection
Andreas Noever (1):
thunderbolt: Fix double free of drom buffer
Andreas Werner (1):
mcb: Fixed bar number assignment for the gdd
Andy Gross (1):
clk: qcom: msm8916: Fix crypto clock flags
Andy Honig (1):
KVM: MTRR: remove MSR 0x2f8
Andy Shevchenko (2):
serial: 8250_mid: use proper bar for DNV platform
serial: 8250_mid: recognize interrupt source in handler
Arnd Bergmann (1):
kbuild: move -Wunused-const-variable to W=1 warning level
Ashutosh Dixit (1):
misc: mic: Fix for double fetch security bug in VOP driver
Bart Van Assche (2):
IB/srp: Fix a debug kernel crash IB/srp: Fix srp_create_target() error handling
Brian Bloniarz (1):
Fix OpenSSH pty regression on close
Bruce Rogers (1):
KVM: x86: fix ordering of cr0 initialization code in vmx_cpu_reset
Catalin Marinas (4):
arm64: Fix typo in the pmdp_huge_get_and_clear() definition
arm64: Ensure pmd_present() returns false after pmd_mknotpresent()
arm64: Implement ptep_set_access_flags() for hardware AF/DBM
arm64: Implement pmdp_set_access_flags() for hardware AF/DBM
Catalin Vasile (1):
crypto: caam - fix caam_jr_alloc() ret code
Chanwoo Choi (1):
serial: samsung: Reorder the sequence of clock control when call s3c24xx_serial_set_termios()
Chris Bainbridge (1):
usb: core: hub: hub_port_init lock controller instead of bus
Chris Mason (1):
Btrfs: fix handling of faults from btrfs_copy_from_user
Christophe Ricard (1):
nfc: st21nfca: Fix static checker warning
Corentin LABBE (1):
crypto: sun4i-ss - Replace spinlock_bh by spin_lock_irq{save|restore}Dave Hansen (1):
x86/cpufeature, x86/mm/pkeys: Fix broken compile-time disabling of pkeys
David Müller (1):
serial: 8250_pci: fix divide error bug if baud rate is 0
Gabriele Mazzotta (1):
dell-rbtn: Ignore ACPI notifications if device is suspended
Gavin Shan (1):
KVM: PPC: Book3S HV: Fix build error in book3s_hv.c
Greg Kroah-Hartman (1):
Linux 4.6.1
Guenter Roeck (1):
watchdog: core: Fix circular locking dependency
H Hartley Sweeten (1):
staging: comedi: das1800: fix possible NULL dereference
Heinz Mauelshagen (1):
md: md.c: fix oops in mddev_suspend for raid0
Horia Geant? (1):
crypto: talitos - fix ahash algorithms registration
Hui Wang (1):
ALSA: hda - Fix headset mic detection problem for one Dell machine
Jaegeuk Kim (1):
fscrypto/f2fs: allow fs-specific key prefix for fs encryption
James Hogan (3):
MIPS: KVM: Fix timer IRQ race when freezing timer
MIPS: KVM: Fix timer IRQ race when writing CP0_Compare
SIGNAL: Move generic copy_siginfo() to signal.h
Jan Beulich (1):
objtool: Allow building with older libelf
Jiri Olsa (1):
perf/x86/intel/uncore: Remove WARN_ON_ONCE in uncore_pci_probe
Jiri Slaby (4):
Bluetooth: vhci: fix open_timeout vs. hdev race
Bluetooth: vhci: purge unhandled skbs
tty: vt, return error when con_startup fails
TTY: n_gsm, fix false positive WARN_ON
Johan Hovold (5):
USB: serial: mxuport: fix use-after-free in probe error path
USB: serial: keyspan: fix use-after-free in probe error path
USB: serial: quatech2: fix use-after-free in probe error path
USB: serial: io_edgeport: fix memory leaks in attach error path
USB: serial: io_edgeport: fix memory leaks in probe error path
Johannes Thumshirn (2):
scsi: Add intermediate STARGET_REMOVE state to scsi_target_state Revert "scsi: fix soft lockup in scsi_remove_target() on module removal"
John Stultz (1):
asix: Fix offset calculation in asix_rx_fixup() causing slow transmissions
Josh Poimboeuf (1):
crypto: sha1-mb - make sha1_x8_avx2() conform to C function ABI
Julien Grall (1):
arm64: cpuinfo: Missing NULL terminator in compat_hwcap_str
Kai-Heng Feng (1):
ALSA: hda - Fix headphone noise on Dell XPS 13 9360
Kailang Yang (2):
ALSA: hda/realtek - New codecs support for ALC234/ALC274/ALC294
ALSA: hda/realtek - Add support for ALC295/ALC3254
Konstantin Shkolnyy (1):
USB: serial: cp210x: fix hardware flow-control disable
Lars-Peter Clausen (1):
usb: gadget: f_fs: Fix EFAULT generation for async read operations
Lei Liu (1):
USB: serial: option: add even more ZTE device ids
Lucas Stach (1):
watchdog: sp5100_tco: properly check for new register layouts
Luke Dashjr (1):
btrfs: bugfix: handle FS_IOC32_{GETFLAGS,SETFLAGS,GETVERSION} in btrfs_ioctl
Lv Zheng (1):
ACPI / osi: Fix an issue that acpi_osi=!* cannot disable ACPICA internal strings
Manfred Schlaegl (1):
Input: pwm-beeper - fix - scheduling while atomic
Marc Zyngier (2):
arm/arm64: KVM: Enforce Break-Before-Make on Stage-2 page tables irqchip/gic-v3: Configure all interrupts as non-secure Group-1
Martin Sperl (1):
clk: bcm2835: add locking to pll*_on/off methods
Mathias Nyman (1):
usb: misc: usbtest: fix pattern tests for scatterlists.
Matt Evans (1):
kvm: arm64: Fix EC field in inject_abt64
Matt Gumbel (1):
mmc: longer timeout for long read time quirk
Michal Nazarewicz (1):
usb: f_mass_storage: test whether thread is running before starting another
Mikulas Patocka (2):
hpfs: fix remount failure when there are no options changed
hpfs: implement the show_options method
Olga Kornievskaia (1):
Fixing oops in callback path
Oliver Hartkopp (1):
can: fix handling of unmodifiable configuration options
Peter Zijlstra (1):
locking,qspinlock: Fix spin_is_locked() and spin_unlock_wait()
Richard Weinberger (1):
UBI: Fix static volume checks when Fastmap is used
Roger Quadros (1):
mfd: omap-usb-tll: Fix scheduling while atomic BUG
Schemmel Hans-Christoph (1):
USB: serial: option: add support for Cinterion PH8 and AHxx
Stefan Metzmacher (4):
fs/cifs: correctly to anonymous authentication via NTLMSSP fs/cifs: correctly to anonymous authentication for the LANMAN authentication fs/cifs: correctly to anonymous authentication for the NTLM(v1) authentication fs/cifs: correctly to anonymous authentication for the NTLM(v2) authentication
Stefano Stabellini (1):
xen/x86: actually allocate legacy interrupts on PV guests
Steve French (1):
remove directory incorrectly tries to set delete on close on non-empty directories
Steven Rostedt (Red Hat) (2):
ring-buffer: Use long for nr_pages to avoid overflow failures
ring-buffer: Prevent overflow of size in ring_buffer_resize()
Takashi Iwai (1):
Bluetooth: vhci: Fix race at creating hci device
Ulf Hansson (1):
ACPI / PM: Export acpi_device_fix_up_power()
Vik Heyndrickx (1):
sched/loadavg: Fix loadavg artifacts on fully idle and on fully loaded systems
Will Deacon (1):
irqchip/gic: Ensure ordering between read of INTACK and shared data
Yoshihiro Shimoda (2):
usb: gadget: udc: core: Fix argument of dev_err() in usb_gadget_map_request()
usb: host: xhci-rcar: Avoid long wait in xhci_reset()
lei liu (1):
USB: serial: option: add more ZTE device ids
Greg KH
maintainerDocumentation/serial/tty.txt +0 -3
@@ -210,9 +210,6 @@ TTY_IO_ERROR If set, causes all subsequent userspace read/write TTY_OTHER_CLOSED Device is a pty and the other side has closed. -TTY_OTHER_DONE Device is a pty and the other side has closed and - all pending input processing has been completed. - TTY_NO_WRITE_SPLIT Prevent driver from splitting up writes into smaller chunks.
Makefile +4 -3
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 6 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = NAME = Charred Weasel
@@ -697,9 +697,10 @@ KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,) KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior) else -# This warning generated too much noise in a regular build. -# Use make W=1 to enable this warning (see scripts/Makefile.build) +# These warnings generated too much noise in a regular build. +# Use make W=1 to enable them (see scripts/Makefile.build) KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable) +KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable) endif ifdef CONFIG_FRAME_POINTER
arch/arm/kvm/mmu.c +11 -6
@@ -893,11 +893,14 @@ static int stage2_set_pmd_huge(struct kvm *kvm, struct kvm_mmu_memory_cacheVM_BUG_ON (pmd_present (*pmd) &&pmd_pfn (*pmd) !=pmd_pfn (*new_pmd)); old_pmd = *pmd; -kvm_set_pmd (pmd, *new_pmd); -if (pmd_present (old_pmd)) +if (pmd_present (old_pmd)) { +pmd_clear (pmd);kvm_tlb_flush_vmid_ipa (kvm, addr); -else + }else {get_page (virt_to_page (pmd)); + } + +kvm_set_pmd (pmd, *new_pmd);return 0 ; }
@@ -946,12 +949,14 @@ static int stage2_set_pte(struct kvm *kvm, struct kvm_mmu_memory_cache *cache,/* Create 2nd stage page table mapping - Level 3 */ old_pte = *pte; -kvm_set_pte (pte, *new_pte); -if (pte_present (old_pte)) +if (pte_present (old_pte)) { +kvm_set_pte (pte,__pte (0 ));kvm_tlb_flush_vmid_ipa (kvm, addr); -else + }else {get_page (virt_to_page (pte)); + } +kvm_set_pte (pte, *new_pte);return 0 ; }
arch/arm64/include/asm/pgtable-hwdef.h +0 -1
@@ -133,7 +133,6 @@* Section */ #define PMD_SECT_VALID (_AT(pmdval_t, 1) << 0) -#define PMD_SECT_PROT_NONE (_AT(pmdval_t, 1) << 58)#define PMD_SECT_USER (_AT(pmdval_t, 1) << 6)/* AP[1] */ #define PMD_SECT_RDONLY (_AT(pmdval_t, 1) << 7)/* AP[2] */ #define PMD_SECT_S (_AT(pmdval_t, 3) << 8)
arch/arm64/include/asm/pgtable.h +20 -5
@@ -280,6 +280,7 @@ static inline pgprot_t mk_sect_prot(pgprot_t prot)#define pmd_trans_huge (pmd) (pmd_val(pmd) && !(pmd_val(pmd) & PMD_TABLE_BIT))#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ +#define pmd_present (pmd) pte_present(pmd_pte(pmd))#define pmd_dirty (pmd) pte_dirty(pmd_pte(pmd))#define pmd_young (pmd) pte_young(pmd_pte(pmd))#define pmd_wrprotect (pmd) pte_pmd(pte_wrprotect(pmd_pte(pmd)))
@@ -288,7 +289,7 @@ static inline pgprot_t mk_sect_prot(pgprot_t prot)#define pmd_mkclean (pmd) pte_pmd(pte_mkclean(pmd_pte(pmd)))#define pmd_mkdirty (pmd) pte_pmd(pte_mkdirty(pmd_pte(pmd)))#define pmd_mkyoung (pmd) pte_pmd(pte_mkyoung(pmd_pte(pmd))) -#define pmd_mknotpresent (pmd) (__pmd(pmd_val(pmd) & ~PMD_TYPE_MASK)) +#define pmd_mknotpresent (pmd) (__pmd(pmd_val(pmd) & ~PMD_SECT_VALID))#define __HAVE_ARCH_PMD_WRITE#define pmd_write (pmd) pte_write(pmd_pte(pmd))
@@ -327,7 +328,6 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, unsigned long size, pgprot_t vma_prot);#define pmd_none (pmd) (!pmd_val(pmd)) -#define pmd_present (pmd) (pmd_val(pmd))#define pmd_bad (pmd) (!(pmd_val(pmd) & 2))
@@ -526,6 +526,21 @@ static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot) }#ifdef CONFIG_ARM64_HW_AFDBM +#define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS +extern int ptep_set_access_flags (struct vm_area_struct *vma, +unsigned long address,pte_t *ptep, +pte_t entry,int dirty); + +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +#define __HAVE_ARCH_PMDP_SET_ACCESS_FLAGS +static inline int pmdp_set_access_flags (struct vm_area_struct *vma, +unsigned long address,pmd_t *pmdp, +pmd_t entry,int dirty) +{ +return ptep_set_access_flags (vma, address, (pte_t *)pmdp,pmd_pte (entry), dirty); +} +#endif +/* * Atomic pte/pmd modifications. */
@@ -578,9 +593,9 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, }#ifdef CONFIG_TRANSPARENT_HUGEPAGE -#define __HAVE_ARCH_PMDP_GET_AND_CLEAR -static inline pmd_t pmdp_get_and_clear (struct mm_struct *mm, -unsigned long address,pmd_t *pmdp) +#define __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEAR +static inline pmd_t pmdp_huge_get_and_clear (struct mm_struct *mm, +unsigned long address,pmd_t *pmdp) {return pte_pmd (ptep_get_and_clear (mm, address, (pte_t *)pmdp)); }
arch/arm64/kernel/cpuinfo.c +2 -1
@@ -87,7 +87,8 @@ static const char *const compat_hwcap_str[] = {"idivt" ,"vfpd32" ,"lpae" , -"evtstrm" +"evtstrm" , +NULL }; static const char *const compat_hwcap2_str[] = {
arch/arm64/kvm/inject_fault.c +1 -1
@@ -162,7 +162,7 @@ static void inject_abt64(struct kvm_vcpu *vcpu, bool is_iabt, unsigned long addr esr |= (ESR_ELx_EC_IABT_CUR << ESR_ELx_EC_SHIFT);if (!is_iabt) - esr |= ESR_ELx_EC_DABT_LOW; + esr |= ESR_ELx_EC_DABT_LOW << ESR_ELx_EC_SHIFT;vcpu_sys_reg (vcpu,ESR_EL1 ) = esr | ESR_ELx_FSC_EXTABT; }
arch/arm64/mm/fault.c +50 -0
56 lines not on this page · raw message
arch/mips/include/asm/kvm_host.h +1 -1
@@ -747,7 +747,7 @@ extern enum emulation_result kvm_mips_complete_mmio_load(struct kvm_vcpu *vcpu,uint32_t kvm_mips_read_count (struct kvm_vcpu *vcpu);void kvm_mips_write_count (struct kvm_vcpu *vcpu,uint32_t count); -void kvm_mips_write_compare (struct kvm_vcpu *vcpu,uint32_t compare); +void kvm_mips_write_compare (struct kvm_vcpu *vcpu,uint32_t compare,bool ack);void kvm_mips_init_count (struct kvm_vcpu *vcpu);int kvm_mips_set_count_ctl (struct kvm_vcpu *vcpu,s64 count_ctl);int kvm_mips_set_count_resume (struct kvm_vcpu *vcpu,s64 count_resume);
arch/mips/kvm/emulate.c +50 -39
134 lines not on this page · raw message
arch/mips/kvm/trap_emul.c +1 -1
@@ -546,7 +546,7 @@ static int kvm_trap_emul_set_one_reg(struct kvm_vcpu *vcpu,kvm_mips_write_count (vcpu, v);break ;case KVM_REG_MIPS_CP0_COMPARE : -kvm_mips_write_compare (vcpu, v); +kvm_mips_write_compare (vcpu, v, false);break ;case KVM_REG_MIPS_CP0_CAUSE :/*
arch/powerpc/kvm/book3s_hv.c +1 -0
@@ -27,6 +27,7 @@#include <linux/export.h> #include <linux/fs.h> #include <linux/anon_inodes.h> +#include <linux/cpu.h> #include <linux/cpumask.h> #include <linux/spinlock.h> #include <linux/page-flags.h>
arch/x86/crypto/sha-mb/sha1_x8_avx2.S +11 -2
@@ -296,7 +296,11 @@ W14 = TMP_ # ENTRY(sha1_x8_avx2) - push RSP_SAVE + # save callee-saved clobbered registers to comply with C function ABI + push %r12 + push %r13 + push %r14 + push %r15 #save rsp mov %rsp, RSP_SAVE
@@ -446,7 +450,12 @@ lloop: ## Postamble mov RSP_SAVE, %rsp - pop RSP_SAVE + + # restore callee-saved clobbered registers + pop %r15 + pop %r14 + pop %r13 + pop %r12 ret ENDPROC(sha1_x8_avx2)
arch/x86/events/intel/uncore.c +1 -1
@@ -888,7 +888,7 @@ static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *idreturn -ENODEV ; pkg =topology_phys_to_logical_pkg (phys_id); -if (WARN_ON_ONCE (pkg <0 )) +if (pkg <0 )return -EINVAL ;if (UNCORE_PCI_DEV_TYPE (id->driver_data) ==UNCORE_EXTRA_PCI_DEV ) {
arch/x86/include/asm/cpufeature.h +6 -6
@@ -63,9 +63,9 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; (((bit)>>5)==11 && (1UL<<((bit)&31) & REQUIRED_MASK11)) || \ (((bit)>>5)==12 && (1UL<<((bit)&31) & REQUIRED_MASK12)) || \ (((bit)>>5)==13 && (1UL<<((bit)&31) & REQUIRED_MASK13)) || \ - (((bit)>>5)==13 && (1UL<<((bit)&31) & REQUIRED_MASK14)) || \ - (((bit)>>5)==13 && (1UL<<((bit)&31) & REQUIRED_MASK15)) || \ - (((bit)>>5)==14 && (1UL<<((bit)&31) & REQUIRED_MASK16)) ) + (((bit)>>5)==14 && (1UL<<((bit)&31) & REQUIRED_MASK14)) || \ + (((bit)>>5)==15 && (1UL<<((bit)&31) & REQUIRED_MASK15)) || \ + (((bit)>>5)==16 && (1UL<<((bit)&31) & REQUIRED_MASK16)) )#define DISABLED_MASK_BIT_SET (bit) \ ( (((bit)>>5)==0 && (1UL<<((bit)&31) & DISABLED_MASK0 )) || \
@@ -82,9 +82,9 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; (((bit)>>5)==11 && (1UL<<((bit)&31) & DISABLED_MASK11)) || \ (((bit)>>5)==12 && (1UL<<((bit)&31) & DISABLED_MASK12)) || \ (((bit)>>5)==13 && (1UL<<((bit)&31) & DISABLED_MASK13)) || \ - (((bit)>>5)==13 && (1UL<<((bit)&31) & DISABLED_MASK14)) || \ - (((bit)>>5)==13 && (1UL<<((bit)&31) & DISABLED_MASK15)) || \ - (((bit)>>5)==14 && (1UL<<((bit)&31) & DISABLED_MASK16)) ) + (((bit)>>5)==14 && (1UL<<((bit)&31) & DISABLED_MASK14)) || \ + (((bit)>>5)==15 && (1UL<<((bit)&31) & DISABLED_MASK15)) || \ + (((bit)>>5)==16 && (1UL<<((bit)&31) & DISABLED_MASK16)) )#define cpu_has (c, bit) \ (__builtin_constant_p(bit) && REQUIRED_MASK_BIT_SET(bit) ? 1 : \
arch/x86/include/asm/disabled-features.h +3 -3
@@ -29,11 +29,11 @@#endif /* CONFIG_X86_64 */ #ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS -# define DISABLE_PKU (1<<(X86_FEATURE_PKU)) -# define DISABLE_OSPKE (1<<(X86_FEATURE_OSPKE)) -#else # define DISABLE_PKU 0# define DISABLE_OSPKE 0 +#else +# define DISABLE_PKU (1<<(X86_FEATURE_PKU & 31)) +# define DISABLE_OSPKE (1<<(X86_FEATURE_OSPKE & 31))#endif /* CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS */ /*
arch/x86/kernel/cpu/common.c +4 -0
@@ -310,6 +310,10 @@ static bool pku_disabled; static __always_inline void setup_pku(struct cpuinfo_x86 *c) { +/* check the boot processor, plus compile options for PKU: */ +if (!cpu_feature_enabled (X86_FEATURE_PKU )) +return ; +/* checks the actual processor's cpuid bits: */ if (!cpu_has (c,X86_FEATURE_PKU ))return ;if (pku_disabled)
arch/x86/kvm/mtrr.c +0 -2
@@ -44,8 +44,6 @@ static bool msr_mtrr_valid(unsigned msr)case MSR_MTRRdefType:case MSR_IA32_CR_PAT :return true; -case 0x2f8 : -return true; }return false; }
arch/x86/kvm/vmx.c +1 -1
@@ -5050,8 +5050,8 @@ static void vmx_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)vmcs_write16 (VIRTUAL_PROCESSOR_ID , vmx->vpid); cr0 =X86_CR0_NW |X86_CR0_CD |X86_CR0_ET ; -vmx_set_cr0 (vcpu, cr0);/* enter rmode */ vmx->vcpu.arch.cr0 = cr0; +vmx_set_cr0 (vcpu, cr0);/* enter rmode */ vmx_set_cr4 (vcpu,0 );vmx_set_efer (vcpu,0 );vmx_fpu_activate (vcpu);
arch/x86/pci/xen.c +5 -2
@@ -491,8 +491,11 @@ int __init pci_xen_initial_domain(void)#endif __acpi_register_gsi = acpi_register_gsi_xen; __acpi_unregister_gsi =NULL ; -/* Pre-allocate legacy irqs */ -for (irq =0 ; irq <nr_legacy_irqs (); irq++) { +/* +* Pre-allocate the legacy IRQs. Use NR_LEGACY_IRQS here +* because we don't have a PIC and thus nr_legacy_irqs() is zero. +*/ +for (irq =0 ; irq <NR_IRQS_LEGACY ; irq++) {int trigger, polarity;if (acpi_get_override_irq (irq, &trigger, &polarity) ==-1 )
drivers/acpi/device_pm.c +1 -0
@@ -319,6 +319,7 @@ int acpi_device_fix_up_power(struct acpi_device *device)return ret; } +EXPORT_SYMBOL_GPL (acpi_device_fix_up_power);int acpi_device_update_power (struct acpi_device *device,int *state_p) {
drivers/acpi/osl.c +11 -5
@@ -135,7 +135,7 @@ static struct osi_linux { unsigned int enable:1; unsigned int dmi:1; unsigned int cmdline:1; - unsigned int default_disabling:1; +u8 default_disabling; } osi_linux = {0, 0, 0, 0};static u32 acpi_osi_handler (acpi_string interface,u32 supported)
@@ -1751,10 +1751,13 @@ void __init acpi_osi_setup(char *str)if (*str =='!' ) { str++;if (*str =='\0' ) { - osi_linux.default_disabling =1 ; +/* Do not override acpi_osi=!* */ +if (!osi_linux.default_disabling) + osi_linux.default_disabling = +ACPI_DISABLE_ALL_VENDOR_STRINGS ;return ; }else if (*str =='*' ) { -acpi_update_interfaces (ACPI_DISABLE_ALL_STRINGS ); + osi_linux.default_disabling =ACPI_DISABLE_ALL_STRINGS ;for (i =0 ; i <OSI_STRING_ENTRIES_MAX ; i++) { osi = &osi_setup_entries[i]; osi->enable = false;
@@ -1827,10 +1830,13 @@ static void __init acpi_osi_setup_late(void)acpi_status status;if (osi_linux.default_disabling) { - status =acpi_update_interfaces (ACPI_DISABLE_ALL_VENDOR_STRINGS ); + status =acpi_update_interfaces (osi_linux.default_disabling);if (ACPI_SUCCESS (status)) - printk(KERN_INFO PREFIX "Disabled all _OSI OS vendors\n"); + printk(KERN_INFO PREFIX "Disabled all _OSI OS vendors%s\n", + osi_linux.default_disabling == +ACPI_DISABLE_ALL_STRINGS ? +" and feature groups" :"" ); }for (i =0 ; i <OSI_STRING_ENTRIES_MAX ; i++) {
drivers/bluetooth/hci_vhci.c +21 -7
@@ -50,6 +50,7 @@ struct vhci_data {wait_queue_head_t read_wait;struct sk_buff_head readq; +struct mutex open_mutex;struct delayed_work open_timeout; };
@@ -87,12 +88,15 @@ static int vhci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)return 0 ; } -static int vhci_create_device (struct vhci_data *data,__u8 opcode) +static int __vhci_create_device (struct vhci_data *data,__u8 opcode) {struct hci_dev *hdev;struct sk_buff *skb;__u8 dev_type; +if (data->hdev) +return -EBADFD ; +/* bits 0-1 are dev_type (BR/EDR or AMP) */ dev_type = opcode &0x03 ;
@@ -151,6 +155,17 @@ static int vhci_create_device(struct vhci_data *data, __u8 opcode)return 0 ; } +static int vhci_create_device (struct vhci_data *data,__u8 opcode) +{ +int err; + +mutex_lock (&data->open_mutex); + err =__vhci_create_device (data, opcode); +mutex_unlock (&data->open_mutex); + +return err; +} +static inline ssize_t vhci_get_user (struct vhci_data *data,struct iov_iter *from) {
@@ -189,11 +204,6 @@ static inline ssize_t vhci_get_user(struct vhci_data *data,break ;case HCI_VENDOR_PKT : -if (data->hdev) { -kfree_skb (skb); -return -EBADFD ; - } -cancel_delayed_work_sync (&data->open_timeout); opcode = *((__u8 *) skb->data);
@@ -320,6 +330,7 @@ static int vhci_open(struct inode *inode, struct file *file)skb_queue_head_init (&data->readq);init_waitqueue_head (&data->read_wait); +mutex_init (&data->open_mutex);INIT_DELAYED_WORK (&data->open_timeout, vhci_open_timeout); file->private_data = data;
@@ -333,15 +344,18 @@ static int vhci_open(struct inode *inode, struct file *file)static int vhci_release (struct inode *inode,struct file *file) {struct vhci_data *data = file->private_data; -struct hci_dev *hdev = data->hdev; +struct hci_dev *hdev;cancel_delayed_work_sync (&data->open_timeout); + hdev = data->hdev; +if (hdev) {hci_unregister_dev (hdev);hci_free_dev (hdev); } +skb_queue_purge (&data->readq); file->private_data =NULL ;kfree (data);
drivers/clk/bcm/clk-bcm2835.c +4 -0
@@ -1079,10 +1079,12 @@ static void bcm2835_pll_divider_off(struct clk_hw *hw)struct bcm2835_cprman *cprman = divider->cprman;const struct bcm2835_pll_divider_data *data = divider->data; +spin_lock (&cprman->regs_lock);cprman_write (cprman, data->cm_reg, (cprman_read (cprman, data->cm_reg) & ~data->load_mask) | data->hold_mask);cprman_write (cprman, data->a2w_reg,A2W_PLL_CHANNEL_DISABLE ); +spin_unlock (&cprman->regs_lock); }static int bcm2835_pll_divider_on (struct clk_hw *hw)
@@ -1091,12 +1093,14 @@ static int bcm2835_pll_divider_on(struct clk_hw *hw)struct bcm2835_cprman *cprman = divider->cprman;const struct bcm2835_pll_divider_data *data = divider->data; +spin_lock (&cprman->regs_lock);cprman_write (cprman, data->a2w_reg,cprman_read (cprman, data->a2w_reg) & ~A2W_PLL_CHANNEL_DISABLE );cprman_write (cprman, data->cm_reg,cprman_read (cprman, data->cm_reg) & ~data->hold_mask); +spin_unlock (&cprman->regs_lock);return 0 ; }
drivers/clk/qcom/gcc-msm8916.c +2 -0
@@ -2346,6 +2346,7 @@ static struct clk_branch gcc_crypto_ahb_clk = { "pcnoc_bfdcd_clk_src", }, .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, .ops = &clk_branch2_ops, }, },
@@ -2381,6 +2382,7 @@ static struct clk_branch gcc_crypto_clk = { "crypto_clk_src", }, .num_parents = 1, + .flags = CLK_SET_RATE_PARENT, .ops = &clk_branch2_ops, }, },
drivers/crypto/caam/jr.c +1 -1
@@ -248,7 +248,7 @@ static void caam_jr_dequeue(unsigned long devarg)struct device *caam_jr_alloc (void ) {struct caam_drv_private_jr *jrpriv, *min_jrpriv =NULL ; -struct device *dev =NULL ; +struct device *dev =ERR_PTR (-ENODEV );int min_tfm_cnt =INT_MAX ;int tfm_cnt;
drivers/crypto/sunxi-ss/sun4i-ss-cipher.c +6 -4
@@ -35,6 +35,7 @@ static int sun4i_ss_opti_poll(struct ablkcipher_request *areq)unsigned int todo;struct sg_mapping_iter mi, mo;unsigned int oi, oo;/* offset for in and out */ +unsigned long flags;if (areq->nbytes ==0 )return 0 ;
@@ -49,7 +50,7 @@ static int sun4i_ss_opti_poll(struct ablkcipher_request *areq)return -EINVAL ; } -spin_lock_bh (&ss->slock); +spin_lock_irqsave (&ss->slock, flags);for (i =0 ; i < op->keylen; i +=4 )writel (*(op->key + i /4 ), ss->base +SS_KEY0 + i);
@@ -117,7 +118,7 @@ release_ss:sg_miter_stop (&mi);sg_miter_stop (&mo);writel (0 , ss->base +SS_CTL ); -spin_unlock_bh (&ss->slock); +spin_unlock_irqrestore (&ss->slock, flags);return err; }
@@ -149,6 +150,7 @@ static int sun4i_ss_cipher_poll(struct ablkcipher_request *areq)unsigned int ob =0 ;/* offset in buf */ unsigned int obo =0 ;/* offset in bufo*/ unsigned int obl =0 ;/* length of data in bufo */ +unsigned long flags;if (areq->nbytes ==0 )return 0 ;
@@ -181,7 +183,7 @@ static int sun4i_ss_cipher_poll(struct ablkcipher_request *areq)if (no_chunk ==1 )return sun4i_ss_opti_poll (areq); -spin_lock_bh (&ss->slock); +spin_lock_irqsave (&ss->slock, flags);for (i =0 ; i < op->keylen; i +=4 )writel (*(op->key + i /4 ), ss->base +SS_KEY0 + i);
@@ -307,7 +309,7 @@ release_ss:sg_miter_stop (&mi);sg_miter_stop (&mo);writel (0 , ss->base +SS_CTL ); -spin_unlock_bh (&ss->slock); +spin_unlock_irqrestore (&ss->slock, flags);return err; }
drivers/crypto/talitos.c +64 -0
154 lines not on this page · raw message
drivers/infiniband/ulp/srp/ib_srp.c +8 -8
@@ -448,16 +448,16 @@ static struct srp_fr_pool *srp_alloc_fr_pool(struct srp_target_port *target)/** * srp_destroy_qp() - destroy an RDMA queue pair -* @ch: SRP RDMA channel. +* @qp: RDMA queue pair. * * Drain the qp before destroying it. This avoids that the receive * completion handler can access the queue pair while it is * being destroyed. */ -static void srp_destroy_qp (struct srp_rdma_ch *ch) +static void srp_destroy_qp (struct ib_qp *qp) { -ib_drain_rq (ch->qp); -ib_destroy_qp (ch->qp); +ib_drain_rq (qp); +ib_destroy_qp (qp); }static int srp_create_ch_ib (struct srp_rdma_ch *ch)
@@ -530,7 +530,7 @@ static int srp_create_ch_ib(struct srp_rdma_ch *ch) }if (ch->qp) -srp_destroy_qp (ch); +srp_destroy_qp (ch->qp);if (ch->recv_cq)ib_free_cq (ch->recv_cq);if (ch->send_cq)
@@ -554,7 +554,7 @@ static int srp_create_ch_ib(struct srp_rdma_ch *ch)return 0 ; err_qp: -srp_destroy_qp (ch); +srp_destroy_qp (qp); err_send_cq:ib_free_cq (send_cq);
@@ -597,7 +597,7 @@ static void srp_free_ch_ib(struct srp_target_port *target,ib_destroy_fmr_pool (ch->fmr_pool); } -srp_destroy_qp (ch); +srp_destroy_qp (ch->qp);ib_free_cq (ch->send_cq);ib_free_cq (ch->recv_cq);
@@ -1509,7 +1509,7 @@ static int srp_map_idb(struct srp_rdma_ch *ch, struct srp_request *req,if (dev->use_fast_reg) { state.sg = idb_sg; -sg_set_buf (idb_sg, req->indirect_desc, idb_len); +sg_init_one (idb_sg, req->indirect_desc, idb_len); idb_sg->dma_address = req->indirect_dma_addr;/* hack! */ #ifdef CONFIG_NEED_SG_DMA_LENGTH idb_sg->dma_length = idb_sg->length;/* hack^2 */
drivers/input/misc/pwm-beeper.c +48 -21
128 lines not on this page · raw message
drivers/irqchip/irq-gic-v3.c +19 -0
@@ -364,6 +364,13 @@ static asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regsif (static_key_true (&supports_deactivate))gic_write_dir (irqnr);#ifdef CONFIG_SMP +/* +* Unlike GICv2, we don't need an smp_rmb() here. +* The control dependency from gic_read_iar to +* the ISB in gic_write_eoir is enough to ensure +* that any shared data read by handle_IPI will +* be read after the ACK. +*/ handle_IPI (irqnr, regs);#else WARN_ONCE (true,"Unexpected SGI received!\n" );
@@ -383,6 +390,15 @@ static void __init gic_dist_init(void)writel_relaxed (0 , base +GICD_CTLR );gic_dist_wait_for_rwp (); +/* +* Configure SPIs as non-secure Group-1. This will only matter +* if the GIC only has a single security state. This will not +* do the right thing if the kernel is running in secure mode, +* but that's not the intended use case anyway. +*/ +for (i =32 ; i < gic_data.irq_nr; i +=32 ) +writel_relaxed (~0 , base +GICD_IGROUPR + i /8 ); +gic_dist_config (base, gic_data.irq_nr, gic_dist_wait_for_rwp);/* Enable distributor with ARE, Group1 */
@@ -500,6 +516,9 @@ static void gic_cpu_init(void) rbase =gic_data_rdist_sgi_base (); +/* Configure SGIs/PPIs as non-secure Group-1 */ +writel_relaxed (~0 , rbase +GICR_IGROUPR0 ); +gic_cpu_config (rbase, gic_redist_wait_for_rwp);/* Give LPIs a spin */
drivers/irqchip/irq-gic.c +8 -0
@@ -344,6 +344,14 @@ static void __exception_irq_entry gic_handle_irq(struct pt_regs *regs)if (static_key_true (&supports_deactivate))writel_relaxed (irqstat, cpu_base +GIC_CPU_DEACTIVATE );#ifdef CONFIG_SMP +/* +* Ensure any shared data written by the CPU sending +* the IPI is read after we've read the ACK register +* on the GIC. +* +* Pairs with the write barrier in gic_raise_softirq +*/ +smp_rmb ();handle_IPI (irqnr, regs);#endif continue ;
drivers/mcb/mcb-parse.c +1 -1
@@ -57,7 +57,7 @@ static int chameleon_parse_gdd(struct mcb_bus *bus, mdev->id =GDD_DEV (reg1); mdev->rev =GDD_REV (reg1); mdev->var =GDD_VAR (reg1); - mdev->bar =GDD_BAR (reg1); + mdev->bar =GDD_BAR (reg2); mdev->group =GDD_GRP (reg2); mdev->inst =GDD_INS (reg2);
drivers/md/md.c +1 -1
@@ -307,7 +307,7 @@ static blk_qc_t md_make_request(struct request_queue *q, struct bio *bio)*/ void mddev_suspend (struct mddev *mddev) { -WARN_ON_ONCE (current == mddev->thread->tsk); +WARN_ON_ONCE (mddev->thread && current == mddev->thread->tsk);if (mddev->suspended++)return ;synchronize_rcu ();
drivers/mfd/omap-usb-tll.c +9 -4
@@ -269,6 +269,8 @@ static int usbtll_omap_probe(struct platform_device *pdev)if (IS_ERR (tll->ch_clk[i]))dev_dbg (dev,"can't get clock : %s\n" , clkname); +else +clk_prepare (tll->ch_clk[i]); }pm_runtime_put_sync (dev);
@@ -301,9 +303,12 @@ static int usbtll_omap_remove(struct platform_device *pdev) tll_dev =NULL ;spin_unlock (&tll_lock); -for (i =0 ; i < tll->nch; i++) -if (!IS_ERR (tll->ch_clk[i])) +for (i =0 ; i < tll->nch; i++) { +if (!IS_ERR (tll->ch_clk[i])) { +clk_unprepare (tll->ch_clk[i]);clk_put (tll->ch_clk[i]); + } + }pm_runtime_disable (&pdev->dev);return 0 ;
@@ -420,7 +425,7 @@ int omap_tll_enable(struct usbhs_omap_platform_data *pdata)if (IS_ERR (tll->ch_clk[i]))continue ; - r =clk_prepare_enable (tll->ch_clk[i]); + r =clk_enable (tll->ch_clk[i]);if (r) {dev_err (tll_dev,"Error enabling ch %d clock: %d\n" , i, r);
@@ -448,7 +453,7 @@ int omap_tll_disable(struct usbhs_omap_platform_data *pdata)for (i =0 ; i < tll->nch; i++) {if (omap_usb_mode_needs_tll (pdata->port_mode[i])) {if (!IS_ERR (tll->ch_clk[i])) -clk_disable_unprepare (tll->ch_clk[i]); +clk_disable (tll->ch_clk[i]); } }
drivers/misc/mei/amthif.c +3 -1
@@ -380,8 +380,10 @@ int mei_amthif_irq_read_msg(struct mei_cl *cl, dev = cl->dev; -if (dev->iamthif_state !=MEI_IAMTHIF_READING ) +if (dev->iamthif_state !=MEI_IAMTHIF_READING ) { +mei_irq_discard_msg (dev, mei_hdr);return 0 ; + } ret =mei_cl_irq_read_msg (cl, mei_hdr, cmpl_list);if (ret)
drivers/misc/mei/bus.c +12 -3
@@ -220,17 +220,23 @@ EXPORT_SYMBOL_GPL(mei_cldev_recv);static void mei_cl_bus_event_work (struct work_struct *work) {struct mei_cl_device *cldev; +struct mei_device *bus; cldev = container_of(work, struct mei_cl_device, event_work); + bus = cldev->bus; +if (cldev->event_cb) cldev->event_cb (cldev, cldev->events, cldev->event_context); cldev->events =0 ;/* Prepare for the next read */ -if (cldev->events_mask &BIT (MEI_CL_EVENT_RX )) +if (cldev->events_mask &BIT (MEI_CL_EVENT_RX )) { +mutex_lock (&bus->device_lock);mei_cl_read_start (cldev->cl,0 ,NULL ); +mutex_unlock (&bus->device_lock); + } }/**
@@ -304,6 +310,7 @@ int mei_cldev_register_event_cb(struct mei_cl_device *cldev,unsigned long events_mask, mei_cldev_event_cb_t event_cb, void *context) { + struct mei_device *bus = cldev->bus;int ret;if (cldev->event_cb)
@@ -316,15 +323,17 @@ int mei_cldev_register_event_cb(struct mei_cl_device *cldev,INIT_WORK (&cldev->event_work, mei_cl_bus_event_work);if (cldev->events_mask &BIT (MEI_CL_EVENT_RX )) { +mutex_lock (&bus->device_lock); ret =mei_cl_read_start (cldev->cl,0 ,NULL ); +mutex_unlock (&bus->device_lock);if (ret && ret != -EBUSY )return ret; }if (cldev->events_mask &BIT (MEI_CL_EVENT_NOTIF )) { -mutex_lock (&cldev->cl->dev->device_lock); +mutex_lock (&bus->device_lock); ret =mei_cl_notify_request (cldev->cl,NULL , event_cb ?1 :0 ); -mutex_unlock (&cldev->cl->dev->device_lock); +mutex_unlock (&bus->device_lock);if (ret)return ret; }
drivers/misc/mei/client.c +4 -0
@@ -1767,6 +1767,10 @@ void mei_cl_complete(struct mei_cl *cl, struct mei_cl_cb *cb)wake_up (&cl->wait);break ; +case MEI_FOP_DISCONNECT_RSP : +mei_io_cb_free (cb); +mei_cl_set_disconnected (cl); +break ;default :BUG_ON (0 ); }
drivers/misc/mei/hbm.c +1 -2
@@ -882,8 +882,7 @@ static int mei_hbm_fw_disconnect_req(struct mei_device *dev, cb =mei_io_cb_init (cl,MEI_FOP_DISCONNECT_RSP ,NULL );if (!cb)return -ENOMEM ; -cl_dbg (dev, cl,"add disconnect response as first\n" ); -list_add (&cb->list, &dev->ctrl_wr_list.list); +list_add_tail (&cb->list, &dev->ctrl_wr_list.list); }return 0 ; }
drivers/misc/mei/interrupt.c +1 -5
@@ -76,7 +76,6 @@ static inline int mei_cl_hbm_equal(struct mei_cl *cl,* @dev: mei device * @hdr: message header */ -static inline void mei_irq_discard_msg (struct mei_device *dev,struct mei_msg_hdr *hdr) {/*
@@ -194,10 +193,7 @@ static int mei_cl_irq_disconnect_rsp(struct mei_cl *cl, struct mei_cl_cb *cb,return -EMSGSIZE ; ret =mei_hbm_cl_disconnect_rsp (dev, cl); -mei_cl_set_disconnected (cl); -mei_io_cb_free (cb); -mei_me_cl_put (cl->me_cl); - cl->me_cl =NULL ; +list_move_tail (&cb->list, &cmpl_list->list);return ret; }
drivers/misc/mei/mei_dev.h +2 -0
@@ -704,6 +704,8 @@ bool mei_hbuf_acquire(struct mei_device *dev);bool mei_write_is_idle (struct mei_device *dev); +void mei_irq_discard_msg (struct mei_device *dev,struct mei_msg_hdr *hdr); +#if IS_ENABLED (CONFIG_DEBUG_FS )int mei_dbgfs_register (struct mei_device *dev,const char *name);void mei_dbgfs_deregister (struct mei_device *dev);
drivers/misc/mic/vop/vop_vringh.c +5 -0
@@ -950,6 +950,11 @@ static long vop_ioctl(struct file *f, unsigned int cmd, unsigned long arg) ret = -EINVAL ; goto free_ret; } +/* Ensure desc has not changed between the two reads */ +if (memcmp (&dd, dd_config,sizeof (dd))) { + ret = -EINVAL ; + goto free_ret; + }mutex_lock (&vdev->vdev_mutex);mutex_lock (&vi->vop_mutex); ret =vop_virtio_add_device (vdev, dd_config);
drivers/mmc/card/block.c +3 -2
@@ -2494,11 +2494,12 @@ static const struct mmc_fixup blk_fixups[] = MMC_QUIRK_BLK_NO_CMD23),/* -* Some Micron MMC cards needs longer data read timeout than -* indicated in CSD. +* Some MMC cards need longer data read timeout than indicated in CSD. */ MMC_FIXUP (CID_NAME_ANY ,CID_MANFID_MICRON ,0x200 , add_quirk_mmc,MMC_QUIRK_LONG_READ_TIME ), +MMC_FIXUP ("008GE0" ,CID_MANFID_TOSHIBA ,CID_OEMID_ANY , add_quirk_mmc, + MMC_QUIRK_LONG_READ_TIME),/* * On these Samsung MoviNAND parts, performing secure erase or
drivers/mmc/core/core.c +2 -2
@@ -868,11 +868,11 @@ void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card)/* * Some cards require longer data read timeout than indicated in CSD. * Address this by setting the read timeout to a "reasonably high" -* value. For the cards tested, 300ms has proven enough. If necessary, +* value. For the cards tested, 600ms has proven enough. If necessary, * this value can be increased if other problematic cards require this. */ if (mmc_card_long_read_time (card) && data->flags &MMC_DATA_READ ) { - data->timeout_ns =300000000 ; + data->timeout_ns =600000000 ; data->timeout_clks =0 ; }
drivers/mmc/core/mmc.c +7 -0
@@ -333,6 +333,9 @@ static void mmc_manage_gp_partitions(struct mmc_card *card, u8 *ext_csd) } } +/* Minimum partition switch timeout in milliseconds */ +#define MMC_MIN_PART_SWITCH_TIME 300 +/* * Decode extended CSD. */
@@ -397,6 +400,10 @@ static int mmc_decode_ext_csd(struct mmc_card *card, u8 *ext_csd)/* EXT_CSD value is in units of 10ms, but we store in ms */ card->ext_csd.part_time =10 * ext_csd[EXT_CSD_PART_SWITCH_TIME ]; +/* Some eMMC set the value too low so set a minimum */ +if (card->ext_csd.part_time && + card->ext_csd.part_time <MMC_MIN_PART_SWITCH_TIME ) + card->ext_csd.part_time =MMC_MIN_PART_SWITCH_TIME ;/* Sleep / awake timeout in 100ns units */ if (sa_shift >0 && sa_shift <=0x17 )
drivers/mmc/host/sdhci-acpi.c +9 -4
@@ -277,7 +277,7 @@ static const struct sdhci_acpi_slot sdhci_acpi_slot_int_emmc = { .chip = &sdhci_acpi_chip_int, .caps =MMC_CAP_8_BIT_DATA |MMC_CAP_NONREMOVABLE |MMC_CAP_HW_RESET |MMC_CAP_1_8V_DDR | - MMC_CAP_BUS_WIDTH_TEST | MMC_CAP_WAIT_WHILE_BUSY, + MMC_CAP_WAIT_WHILE_BUSY, .caps2 = MMC_CAP2_HC_ERASE_SZ, .flags = SDHCI_ACPI_RUNTIME_PM, .quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,
@@ -292,7 +292,7 @@ static const struct sdhci_acpi_slot sdhci_acpi_slot_int_sdio = { SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, .quirks2 = SDHCI_QUIRK2_HOST_OFF_CARD_ON, .caps =MMC_CAP_NONREMOVABLE |MMC_CAP_POWER_OFF_CARD | - MMC_CAP_BUS_WIDTH_TEST | MMC_CAP_WAIT_WHILE_BUSY, + MMC_CAP_WAIT_WHILE_BUSY, .flags = SDHCI_ACPI_RUNTIME_PM, .pm_caps = MMC_PM_KEEP_POWER, .probe_slot = sdhci_acpi_sdio_probe_slot,
@@ -304,7 +304,7 @@ static const struct sdhci_acpi_slot sdhci_acpi_slot_int_sd = { .quirks = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC, .quirks2 = SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON | SDHCI_QUIRK2_STOP_WITH_TC, - .caps = MMC_CAP_BUS_WIDTH_TEST | MMC_CAP_WAIT_WHILE_BUSY, + .caps = MMC_CAP_WAIT_WHILE_BUSY, .probe_slot = sdhci_acpi_sd_probe_slot, };
@@ -381,7 +381,7 @@ static int sdhci_acpi_probe(struct platform_device *pdev) {struct device *dev = &pdev->dev;acpi_handle handle =ACPI_HANDLE (dev); -struct acpi_device *device; +struct acpi_device *device, *child;struct sdhci_acpi_host *c;struct sdhci_host *host;struct resource *iomem;
@@ -393,6 +393,11 @@ static int sdhci_acpi_probe(struct platform_device *pdev)if (acpi_bus_get_device (handle, &device))return -ENODEV ; +/* Power on the SDHCI controller and its children */ +acpi_device_fix_up_power (device); +list_for_each_entry (child, &device->children, node) +acpi_device_fix_up_power (child); +if (acpi_bus_get_status (device) || !device->status.present)return -ENODEV ;
drivers/mmc/host/sdhci-pci-core.c +1 -4
@@ -361,7 +361,6 @@ static int byt_emmc_probe_slot(struct sdhci_pci_slot *slot) { slot->host->mmc->caps |=MMC_CAP_8_BIT_DATA |MMC_CAP_NONREMOVABLE |MMC_CAP_HW_RESET |MMC_CAP_1_8V_DDR | -MMC_CAP_BUS_WIDTH_TEST |MMC_CAP_WAIT_WHILE_BUSY ; slot->host->mmc->caps2 |=MMC_CAP2_HC_ERASE_SZ ; slot->hw_reset = sdhci_pci_int_hw_reset;
@@ -377,15 +376,13 @@ static int byt_emmc_probe_slot(struct sdhci_pci_slot *slot)static int byt_sdio_probe_slot (struct sdhci_pci_slot *slot) { slot->host->mmc->caps |=MMC_CAP_POWER_OFF_CARD |MMC_CAP_NONREMOVABLE | -MMC_CAP_BUS_WIDTH_TEST |MMC_CAP_WAIT_WHILE_BUSY ;return 0 ; }static int byt_sd_probe_slot (struct sdhci_pci_slot *slot) { - slot->host->mmc->caps |=MMC_CAP_BUS_WIDTH_TEST | -MMC_CAP_WAIT_WHILE_BUSY ; + slot->host->mmc->caps |=MMC_CAP_WAIT_WHILE_BUSY ; slot->cd_con_id =NULL ; slot->cd_idx =0 ; slot->cd_override_level = true;
drivers/mtd/ubi/eba.c +19 -2
@@ -426,8 +426,25 @@ retry: pnum, vol_id, lnum); err = -EBADMSG ; }else { - err = -EINVAL ; -ubi_ro_mode (ubi); +/* +* Ending up here in the non-Fastmap case +* is a clear bug as the VID header had to +* be present at scan time to have it referenced. +* With fastmap the story is more complicated. +* Fastmap has the mapping info without the need +* of a full scan. So the LEB could have been +* unmapped, Fastmap cannot know this and keeps +* the LEB referenced. +* This is valid and works as the layer above UBI +* has to do bookkeeping about used/referenced +* LEBs in any case. +*/ +if (ubi->fast_attach) { + err = -EBADMSG ; + }else { + err = -EINVAL ; +ubi_ro_mode (ubi); + } } } goto out_free;
drivers/mtd/ubi/fastmap.c +1 -0
@@ -1058,6 +1058,7 @@ int ubi_scan_fastmap(struct ubi_device *ubi, struct ubi_attach_info *ai,ubi_msg (ubi,"fastmap WL pool size: %d" , ubi->fm_wl_pool.max_size); ubi->fm_disabled =0 ; + ubi->fast_attach =1 ;ubi_free_vid_hdr (ubi, vh);kfree (ech);
drivers/mtd/ubi/ubi.h +2 -0
@@ -466,6 +466,7 @@ struct ubi_debug_info {* @fm_eba_sem: allows ubi_update_fastmap() to block EBA table changes * @fm_work: fastmap work queue * @fm_work_scheduled: non-zero if fastmap work was scheduled +* @fast_attach: non-zero if UBI was attached by fastmap * * @used: RB-tree of used physical eraseblocks * @erroneous: RB-tree of erroneous used physical eraseblocks
@@ -574,6 +575,7 @@ struct ubi_device {size_t fm_size;struct work_struct fm_work;int fm_work_scheduled; +int fast_attach;/* Wear-leveling sub-system's stuff */ struct rb_root used;
drivers/net/can/dev.c +52 -4
94 lines not on this page · raw message
drivers/net/can/m_can/m_can.c +1 -1
@@ -955,7 +955,7 @@ static struct net_device *alloc_m_can_dev(void) priv->can.do_get_berr_counter = m_can_get_berr_counter;/* CAN_CTRLMODE_FD_NON_ISO is fixed with M_CAN IP v3.0.1 */ - priv->can.ctrlmode =CAN_CTRLMODE_FD_NON_ISO ; +can_set_static_ctrlmode (dev,CAN_CTRLMODE_FD_NON_ISO );/* CAN_CTRLMODE_FD_NON_ISO can not be changed with M_CAN IP v3.0.1 */ priv->can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK |
drivers/net/usb/asix_common.c +1 -1
@@ -66,7 +66,7 @@ int asix_rx_fixup_internal(struct usbnet *dev, struct sk_buff *skb,* buffer. */ if (rx->remaining && (rx->remaining +sizeof (u32) <= skb->len)) { - offset = ((rx->remaining +1 ) &0xfffe ) +sizeof (u32); + offset = ((rx->remaining +1 ) &0xfffe ); rx->header =get_unaligned_le32 (skb->data + offset); offset =0 ;
drivers/nfc/st21nfca/i2c.c +4 -2
@@ -524,8 +524,10 @@ static int st21nfca_hci_i2c_acpi_request_resources(struct i2c_client *client)/* Get EN GPIO from ACPI */ gpiod_ena =devm_gpiod_get_index (dev,ST21NFCA_GPIO_NAME_EN ,1 ,GPIOD_OUT_LOW ); -if (!IS_ERR (gpiod_ena)) - phy->gpio_ena =desc_to_gpio (gpiod_ena); +if (!IS_ERR (gpiod_ena)) { +nfc_err (dev,"Unable to get ENABLE GPIO\n" ); +return -ENODEV ; + } phy->gpio_ena =desc_to_gpio (gpiod_ena);
drivers/platform/x86/dell-rbtn.c +56 -0
77 lines not on this page · raw message
drivers/scsi/scsi_scan.c +1 -0
@@ -316,6 +316,7 @@ static void scsi_target_destroy(struct scsi_target *starget)struct Scsi_Host *shost =dev_to_shost (dev->parent);unsigned long flags; +BUG_ON (starget->state ==STARGET_DEL ); starget->state =STARGET_DEL ;transport_destroy_device (dev);spin_lock_irqsave (shost->host_lock, flags);
drivers/scsi/scsi_sysfs.c +3 -3
@@ -1366,18 +1366,18 @@ static void __scsi_remove_target(struct scsi_target *starget)void scsi_remove_target (struct device *dev) {struct Scsi_Host *shost =dev_to_shost (dev->parent); -struct scsi_target *starget, *last_target =NULL ; +struct scsi_target *starget;unsigned long flags; restart:spin_lock_irqsave (shost->host_lock, flags);list_for_each_entry (starget, &shost->__targets, siblings) {if (starget->state ==STARGET_DEL || - starget == last_target) + starget->state ==STARGET_REMOVE )continue ;if (starget->dev.parent == dev || &starget->dev == dev) {kref_get (&starget->reap_ref); - last_target = starget; + starget->state =STARGET_REMOVE ;spin_unlock_irqrestore (shost->host_lock, flags);__scsi_remove_target (starget);scsi_target_reap (starget);
drivers/staging/comedi/drivers/das1800.c +13 -9
@@ -567,14 +567,17 @@ static int das1800_cancel(struct comedi_device *dev, struct comedi_subdevice *s)struct comedi_isadma_desc *desc;int i; -outb (0x0 , dev->iobase +DAS1800_STATUS );/* disable conversions */ -outb (0x0 , dev->iobase +DAS1800_CONTROL_B );/* disable interrupts and dma */ -outb (0x0 , dev->iobase +DAS1800_CONTROL_A );/* disable and clear fifo and stop triggering */ - -for (i =0 ; i <2 ; i++) { - desc = &dma->desc[i]; -if (desc->chan) -comedi_isadma_disable (desc->chan); +/* disable and stop conversions */ +outb (0x0 , dev->iobase +DAS1800_STATUS ); +outb (0x0 , dev->iobase +DAS1800_CONTROL_B ); +outb (0x0 , dev->iobase +DAS1800_CONTROL_A ); + +if (dma) { +for (i =0 ; i <2 ; i++) { + desc = &dma->desc[i]; +if (desc->chan) +comedi_isadma_disable (desc->chan); + } }return 0 ;
@@ -934,13 +937,14 @@ static void das1800_ai_setup_dma(struct comedi_device *dev, {struct das1800_private *devpriv = dev->private;struct comedi_isadma *dma = devpriv->dma; -struct comedi_isadma_desc *desc = &dma->desc[0 ]; +struct comedi_isadma_desc *desc;unsigned int bytes;if ((devpriv->irq_dma_bits &DMA_ENABLED ) ==0 )return ; dma->cur_dma =0 ; + desc = &dma->desc[0 ];/* determine a dma transfer size to fill buffer in 0.3 sec */ bytes =das1800_ai_transfer_size (dev, s, desc->maxsize,300000000 );
drivers/thunderbolt/eeprom.c +1 -0
@@ -444,6 +444,7 @@ int tb_drom_read(struct tb_switch *sw)return tb_drom_parse_entries (sw); err:kfree (sw->drom); + sw->drom =NULL ;return -EIO ; }
drivers/tty/n_gsm.c +3 -1
@@ -2045,7 +2045,9 @@ static void gsm_cleanup_mux(struct gsm_mux *gsm) } }spin_unlock (&gsm_mux_lock); -WARN_ON (i ==MAX_MUX ); +/* open failed before registering => nothing to do */ +if (i ==MAX_MUX ) +return ;/* In theory disconnecting DLCI 0 is sufficient but for some modems this is apparently not the case. */
drivers/tty/n_hdlc.c +2 -2
@@ -599,7 +599,7 @@ static ssize_t n_hdlc_tty_read(struct tty_struct *tty, struct file *file,add_wait_queue (&tty->read_wait, &wait);for (;;) { -if (test_bit (TTY_OTHER_DONE , &tty->flags)) { +if (test_bit (TTY_OTHER_CLOSED , &tty->flags)) { ret = -EIO ;break ; }
@@ -827,7 +827,7 @@ static unsigned int n_hdlc_tty_poll(struct tty_struct *tty, struct file *filp,/* set bits for operations that won't block */ if (n_hdlc->rx_buf_list.head) mask |=POLLIN |POLLRDNORM ;/* readable */ -if (test_bit (TTY_OTHER_DONE , &tty->flags)) +if (test_bit (TTY_OTHER_CLOSED , &tty->flags)) mask |=POLLHUP ;if (tty_hung_up_p (filp)) mask |=POLLHUP ;
drivers/tty/n_tty.c +33 -37
102 lines not on this page · raw message
drivers/tty/pty.c +1 -3
@@ -59,7 +59,7 @@ static void pty_close(struct tty_struct *tty, struct file *filp)if (!tty->link)return ;set_bit (TTY_OTHER_CLOSED , &tty->link->flags); -tty_flip_buffer_push (tty->link->port); +wake_up_interruptible (&tty->link->read_wait);wake_up_interruptible (&tty->link->write_wait);if (tty->driver->subtype ==PTY_TYPE_MASTER ) {set_bit (TTY_OTHER_CLOSED , &tty->flags);
@@ -247,9 +247,7 @@ static int pty_open(struct tty_struct *tty, struct file *filp) goto out;clear_bit (TTY_IO_ERROR , &tty->flags); -/* TTY_OTHER_CLOSED must be cleared before TTY_OTHER_DONE */ clear_bit (TTY_OTHER_CLOSED , &tty->link->flags); -clear_bit (TTY_OTHER_DONE , &tty->link->flags);set_bit (TTY_THROTTLED , &tty->flags);return 0 ;
drivers/tty/serial/8250/8250_mid.c +22 -13
@@ -14,6 +14,7 @@#include <linux/pci.h> #include <linux/dma/hsu.h> +#include <linux/8250_pci.h> #include "8250.h"
@@ -24,6 +25,7 @@#define PCI_DEVICE_ID_INTEL_DNV_UART 0x19d8/* Intel MID Specific registers */ +#define INTEL_MID_UART_DNV_FISR 0x08#define INTEL_MID_UART_PS 0x30#define INTEL_MID_UART_MUL 0x34#define INTEL_MID_UART_DIV 0x38
@@ -31,6 +33,7 @@struct mid8250 ;struct mid8250_board { +unsigned int flags;unsigned long freq;unsigned int base_baud;int (*setup)(struct mid8250 *,struct uart_port *p);
@@ -88,16 +91,16 @@ static int tng_setup(struct mid8250 *mid, struct uart_port *p)static int dnv_handle_irq (struct uart_port *p) {struct mid8250 *mid = p->private_data; -int ret; - - ret =hsu_dma_irq (&mid->dma_chip,0 ); - ret |=hsu_dma_irq (&mid->dma_chip,1 ); - -/* For now, letting the HW generate separate interrupt for the UART */ -if (ret) -return ret; - -return serial8250_handle_irq (p,serial_port_in (p,UART_IIR )); +unsigned int fisr =serial_port_in (p,INTEL_MID_UART_DNV_FISR ); +int ret =IRQ_NONE ; + +if (fisr &BIT (2 )) + ret |=hsu_dma_irq (&mid->dma_chip,1 ); +if (fisr &BIT (1 )) + ret |=hsu_dma_irq (&mid->dma_chip,0 ); +if (fisr &BIT (0 )) + ret |=serial8250_handle_irq (p,serial_port_in (p,UART_IIR )); +return ret; }#define DNV_DMA_CHAN_OFFSET 0x80
@@ -106,12 +109,13 @@ static int dnv_setup(struct mid8250 *mid, struct uart_port *p) {struct hsu_dma_chip *chip = &mid->dma_chip;struct pci_dev *pdev =to_pci_dev (p->dev); +unsigned int bar =FL_GET_BASE (mid->board->flags);int ret; chip->dev = &pdev->dev; chip->irq = pdev->irq; chip->regs = p->membase; - chip->length =pci_resource_len (pdev,0 ); + chip->length =pci_resource_len (pdev, bar); chip->offset =DNV_DMA_CHAN_OFFSET ;/* Falling back to PIO mode if DMA probing fails */
@@ -217,6 +221,7 @@ static int mid8250_probe(struct pci_dev *pdev, const struct pci_device_id *id) {struct uart_8250_port uart;struct mid8250 *mid; +unsigned int bar;int ret; ret =pcim_enable_device (pdev);
@@ -230,6 +235,7 @@ static int mid8250_probe(struct pci_dev *pdev, const struct pci_device_id *id)return -ENOMEM ; mid->board = (struct mid8250_board *)id->driver_data; + bar =FL_GET_BASE (mid->board->flags);memset (&uart,0 ,sizeof (struct uart_8250_port ));
@@ -242,8 +248,8 @@ static int mid8250_probe(struct pci_dev *pdev, const struct pci_device_id *id) uart.port.flags =UPF_SHARE_IRQ |UPF_FIXED_PORT |UPF_FIXED_TYPE ; uart.port.set_termios = mid8250_set_termios; - uart.port.mapbase =pci_resource_start (pdev,0 ); - uart.port.membase =pcim_iomap (pdev,0 ,0 ); + uart.port.mapbase =pci_resource_start (pdev, bar); + uart.port.membase =pcim_iomap (pdev, bar,0 );if (!uart.port.membase)return -ENOMEM ;
@@ -282,18 +288,21 @@ static void mid8250_remove(struct pci_dev *pdev) }static const struct mid8250_board pnw_board = { + .flags =FL_BASE0 , .freq =50000000 , .base_baud =115200 , .setup = pnw_setup, };static const struct mid8250_board tng_board = { + .flags =FL_BASE0 , .freq =38400000 , .base_baud =1843200 , .setup = tng_setup, };static const struct mid8250_board dnv_board = { + .flags =FL_BASE1 , .freq =133333333 , .base_baud =115200 , .setup = dnv_setup,
drivers/tty/serial/8250/8250_pci.c +3 -0
@@ -1377,6 +1377,9 @@ byt_set_termios(struct uart_port *p, struct ktermios *termios,unsigned long m, n;u32 reg; +/* Gracefully handle the B0 case: fall back to B9600 */ + fuart = fuart ? fuart :9600 *16 ; +/* Get Fuart closer to Fref */ fuart *=rounddown_pow_of_two (fref / fuart);
drivers/tty/serial/atmel_serial.c +13 -1
@@ -274,6 +274,13 @@ static bool atmel_use_dma_rx(struct uart_port *port)return atmel_port->use_dma_rx; } +static bool atmel_use_fifo (struct uart_port *port) +{ +struct atmel_uart_port *atmel_port =to_atmel_uart_port (port); + +return atmel_port->fifo_size; +} +static unsigned int atmel_get_lines_status (struct uart_port *port) {struct atmel_uart_port *atmel_port =to_atmel_uart_port (port);
@@ -2090,7 +2097,12 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios, mode |=ATMEL_US_USMODE_RS485 ; }else if (termios->c_cflag &CRTSCTS ) {/* RS232 with hardware handshake (RTS/CTS) */ - mode |=ATMEL_US_USMODE_HWHS ; +if (atmel_use_dma_rx (port) && !atmel_use_fifo (port)) { +dev_info (port->dev,"not enabling hardware flow control because DMA is used" ); + termios->c_cflag &= ~CRTSCTS ; + }else { + mode |=ATMEL_US_USMODE_HWHS ; + } }else {/* RS232 without hadware handshake */ mode |=ATMEL_US_USMODE_NORMAL ;
drivers/tty/serial/samsung.c +2 -2
@@ -1271,6 +1271,8 @@ static void s3c24xx_serial_set_termios(struct uart_port *port,/* check to see if we need to change clock source */ if (ourport->baudclk != clk) { +clk_prepare_enable (clk); +s3c24xx_serial_setsource (port, clk_sel);if (!IS_ERR (ourport->baudclk)) {
@@ -1278,8 +1280,6 @@ static void s3c24xx_serial_set_termios(struct uart_port *port, ourport->baudclk =ERR_PTR (-EINVAL ); } -clk_prepare_enable (clk); - ourport->baudclk = clk; ourport->baudclk_rate = clk ?clk_get_rate (clk) :0 ; }
drivers/tty/tty_buffer.c +6 -28
@@ -37,29 +37,6 @@#define TTY_BUFFER_PAGE (((PAGE_SIZE - sizeof(struct tty_buffer)) / 2) & ~0xFF) -/* -* If all tty flip buffers have been processed by flush_to_ldisc() or -* dropped by tty_buffer_flush(), check if the linked pty has been closed. -* If so, wake the reader/poll to process -*/ -static inline void check_other_closed (struct tty_struct *tty) -{ -unsigned long flags, old; - -/* transition from TTY_OTHER_CLOSED => TTY_OTHER_DONE must be atomic */ -for (flags =ACCESS_ONCE (tty->flags); -test_bit (TTY_OTHER_CLOSED , &flags); - ) { - old = flags; -__set_bit (TTY_OTHER_DONE , &flags); - flags =cmpxchg (&tty->flags, old, flags); -if (old == flags) { -wake_up_interruptible (&tty->read_wait); -break ; - } - } -} -/** * tty_buffer_lock_exclusive - gain exclusive access to buffer * tty_buffer_unlock_exclusive - release exclusive access
@@ -254,8 +231,6 @@ void tty_buffer_flush(struct tty_struct *tty, struct tty_ldisc *ld)if (ld && ld->ops->flush_buffer) ld->ops->flush_buffer (tty); -check_other_closed (tty); -atomic_dec (&buf->priority);mutex_unlock (&buf->lock); }
@@ -522,10 +497,8 @@ static void flush_to_ldisc(struct work_struct *work)*/ count =smp_load_acquire (&head->commit) - head->read;if (!count) { -if (next ==NULL ) { -check_other_closed (tty); +if (next ==NULL )break ; - } buf->head = next;tty_buffer_free (port, head);continue ;
@@ -614,3 +587,8 @@ bool tty_buffer_cancel_work(struct tty_port *port) {return cancel_work_sync (&port->buf.work); } + +void tty_buffer_flush_work (struct tty_port *port) +{ +flush_work (&port->buf.work); +}
drivers/tty/vt/vt.c +3 -2
@@ -3583,9 +3583,10 @@ static int do_register_con_driver(const struct consw *csw, int first, int last) goto err; desc = csw->con_startup (); - -if (!desc) +if (!desc) { + retval = -ENODEV ; goto err; + } retval = -EINVAL ;
drivers/usb/core/driver.c +23 -17
@@ -284,7 +284,7 @@ static int usb_probe_interface(struct device *dev)struct usb_device *udev =interface_to_usbdev (intf);const struct usb_device_id *id;int error = -ENODEV ; -int lpm_disable_error; +int lpm_disable_error = -ENODEV ;dev_dbg (dev,"%s\n" , __func__);
@@ -336,12 +336,14 @@ static int usb_probe_interface(struct device *dev)* setting during probe, that should also be fine. usb_set_interface() * will attempt to disable LPM, and fail if it can't disable it. */ - lpm_disable_error =usb_unlocked_disable_lpm (udev); -if (lpm_disable_error && driver->disable_hub_initiated_lpm) { -dev_err (&intf->dev,"%s Failed to disable LPM for driver %s\n." , - __func__, driver->name); - error = lpm_disable_error; - goto err; +if (driver->disable_hub_initiated_lpm) { + lpm_disable_error =usb_unlocked_disable_lpm (udev); +if (lpm_disable_error) { +dev_err (&intf->dev,"%s Failed to disable LPM for driver %s\n." , + __func__, driver->name); + error = lpm_disable_error; + goto err; + } }/* Carry out a deferred switch to altsetting 0 */
@@ -391,7 +393,8 @@ static int usb_unbind_interface(struct device *dev)struct usb_interface *intf =to_usb_interface (dev);struct usb_host_endpoint *ep, **eps =NULL ;struct usb_device *udev; -int i, j, error, r, lpm_disable_error; +int i, j, error, r; +int lpm_disable_error = -ENODEV ; intf->condition =USB_INTERFACE_UNBINDING ;
@@ -399,12 +402,13 @@ static int usb_unbind_interface(struct device *dev) udev =interface_to_usbdev (intf); error =usb_autoresume_device (udev); -/* Hub-initiated LPM policy may change, so attempt to disable LPM until +/* If hub-initiated LPM policy may change, attempt to disable LPM until * the driver is unbound. If LPM isn't disabled, that's fine because it * wouldn't be enabled unless all the bound interfaces supported * hub-initiated LPM. */ - lpm_disable_error =usb_unlocked_disable_lpm (udev); +if (driver->disable_hub_initiated_lpm) + lpm_disable_error =usb_unlocked_disable_lpm (udev);/* * Terminate all URBs for this interface unless the driver
@@ -505,7 +509,7 @@ int usb_driver_claim_interface(struct usb_driver *driver,struct device *dev;struct usb_device *udev;int retval =0 ; -int lpm_disable_error; +int lpm_disable_error = -ENODEV ;if (!iface)return -ENODEV ;
@@ -526,12 +530,14 @@ int usb_driver_claim_interface(struct usb_driver *driver, iface->condition =USB_INTERFACE_BOUND ; -/* Disable LPM until this driver is bound. */ - lpm_disable_error =usb_unlocked_disable_lpm (udev); -if (lpm_disable_error && driver->disable_hub_initiated_lpm) { -dev_err (&iface->dev,"%s Failed to disable LPM for driver %s\n." , - __func__, driver->name); -return -ENOMEM ; +/* See the comment about disabling LPM in usb_probe_interface(). */ +if (driver->disable_hub_initiated_lpm) { + lpm_disable_error =usb_unlocked_disable_lpm (udev); +if (lpm_disable_error) { +dev_err (&iface->dev,"%s Failed to disable LPM for driver %s\n." , + __func__, driver->name); +return -ENOMEM ; + } }/* Claimed interfaces are initially inactive (suspended) and
drivers/usb/core/hcd.c +13 -2
@@ -994,7 +994,7 @@ static void usb_bus_init (struct usb_bus *bus) bus->bandwidth_allocated =0 ; bus->bandwidth_int_reqs =0 ; bus->bandwidth_isoc_reqs =0 ; -mutex_init (&bus->usb_address0_mutex); +mutex_init (&bus->devnum_next_mutex); }/*-------------------------------------------------------------------------*/
@@ -2521,6 +2521,14 @@ struct usb_hcd *usb_create_shared_hcd(const struct hc_driver *driver,return NULL ; }if (primary_hcd ==NULL ) { + hcd->address0_mutex =kmalloc (sizeof (*hcd->address0_mutex), +GFP_KERNEL ); +if (!hcd->address0_mutex) { +kfree (hcd); +dev_dbg (dev,"hcd address0 mutex alloc failed\n" ); +return NULL ; + } +mutex_init (hcd->address0_mutex); hcd->bandwidth_mutex =kmalloc (sizeof (*hcd->bandwidth_mutex),GFP_KERNEL );if (!hcd->bandwidth_mutex) {
@@ -2532,6 +2540,7 @@ struct usb_hcd *usb_create_shared_hcd(const struct hc_driver *driver,dev_set_drvdata (dev, hcd); }else {mutex_lock (&usb_port_peer_mutex); + hcd->address0_mutex = primary_hcd->address0_mutex; hcd->bandwidth_mutex = primary_hcd->bandwidth_mutex; hcd->primary_hcd = primary_hcd; primary_hcd->primary_hcd = primary_hcd;
@@ -2598,8 +2607,10 @@ static void hcd_release(struct kref *kref) struct usb_hcd *hcd = container_of (kref, struct usb_hcd, kref);mutex_lock (&usb_port_peer_mutex); -if (usb_hcd_is_primary_hcd (hcd)) +if (usb_hcd_is_primary_hcd (hcd)) { +kfree (hcd->address0_mutex);kfree (hcd->bandwidth_mutex); + }if (hcd->shared_hcd) {struct usb_hcd *peer = hcd->shared_hcd;
drivers/usb/core/hub.c +4 -4
@@ -2080,7 +2080,7 @@ static void choose_devnum(struct usb_device *udev)struct usb_bus *bus = udev->bus;/* be safe when more hub events are proceed in parallel */ -mutex_lock (&bus->usb_address0_mutex); +mutex_lock (&bus->devnum_next_mutex);if (udev->wusb) { devnum = udev->portnum +1 ;BUG_ON (test_bit (devnum, bus->devmap.devicemap));
@@ -2098,7 +2098,7 @@ static void choose_devnum(struct usb_device *udev)set_bit (devnum, bus->devmap.devicemap); udev->devnum = devnum; } -mutex_unlock (&bus->usb_address0_mutex); +mutex_unlock (&bus->devnum_next_mutex); }static void release_devnum (struct usb_device *udev)
@@ -4364,7 +4364,7 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1,if (oldspeed ==USB_SPEED_LOW ) delay =HUB_LONG_RESET_TIME ; -mutex_lock (&hdev->bus->usb_address0_mutex); +mutex_lock (hcd->address0_mutex);/* Reset the device; full speed may morph to high speed */ /* FIXME a USB 2.0 device may morph into SuperSpeed on reset. */
@@ -4650,7 +4650,7 @@ fail:hub_port_disable (hub, port1,0 );update_devnum (udev, devnum);/* for disconnect processing */ } -mutex_unlock (&hdev->bus->usb_address0_mutex); +mutex_unlock (hcd->address0_mutex);return retval; }
drivers/usb/gadget/function/f_fs.c +1 -1
@@ -651,7 +651,7 @@ static void ffs_user_copy_worker(struct work_struct *work)if (io_data->read && ret >0 ) {use_mm (io_data->mm); ret =copy_to_iter (io_data->buf, ret, &io_data->data); -if (iov_iter_count (&io_data->data)) +if (ret != io_data->req->actual &&iov_iter_count (&io_data->data)) ret = -EFAULT ;unuse_mm (io_data->mm); }
drivers/usb/gadget/function/f_mass_storage.c +15 -21
@@ -2977,25 +2977,6 @@ void fsg_common_set_inquiry_string(struct fsg_common *common, const char *vn, }EXPORT_SYMBOL_GPL (fsg_common_set_inquiry_string); -int fsg_common_run_thread (struct fsg_common *common) -{ - common->state =FSG_STATE_IDLE ; -/* Tell the thread to start working */ - common->thread_task = -kthread_create (fsg_main_thread, common,"file-storage" ); -if (IS_ERR (common->thread_task)) { - common->state =FSG_STATE_TERMINATED ; -return PTR_ERR (common->thread_task); - } - -DBG (common,"I/O thread pid: %d\n" ,task_pid_nr (common->thread_task)); - -wake_up_process (common->thread_task); - -return 0 ; -} -EXPORT_SYMBOL_GPL (fsg_common_run_thread); -static void fsg_common_release (struct kref *ref) { struct fsg_common *common = container_of(ref, struct fsg_common, ref);
@@ -3005,6 +2986,7 @@ static void fsg_common_release(struct kref *ref)if (common->state !=FSG_STATE_TERMINATED ) {raise_exception (common,FSG_STATE_EXIT );wait_for_completion (&common->thread_notifier); + common->thread_task =NULL ; }for (i =0 ; i <ARRAY_SIZE (common->luns); ++i) {
@@ -3050,9 +3032,21 @@ static int fsg_bind(struct usb_configuration *c, struct usb_function *f)if (ret)return ret;fsg_common_set_inquiry_string (fsg->common,NULL ,NULL ); - ret =fsg_common_run_thread (fsg->common); -if (ret) + } + +if (!common->thread_task) { + common->state =FSG_STATE_IDLE ; + common->thread_task = +kthread_create (fsg_main_thread, common,"file-storage" ); +if (IS_ERR (common->thread_task)) { +int ret =PTR_ERR (common->thread_task); + common->thread_task =NULL ; + common->state =FSG_STATE_TERMINATED ;return ret; + } +DBG (common,"I/O thread pid: %d\n" , +task_pid_nr (common->thread_task)); +wake_up_process (common->thread_task); } fsg->gadget = gadget;
drivers/usb/gadget/function/f_mass_storage.h +0 -2
@@ -153,8 +153,6 @@ int fsg_common_create_luns(struct fsg_common *common, struct fsg_config *cfg);void fsg_common_set_inquiry_string (struct fsg_common *common,const char *vn,const char *pn); -int fsg_common_run_thread (struct fsg_common *common); -void fsg_config_from_params (struct fsg_config *cfg,const struct fsg_module_parameters *params,unsigned int fsg_num_buffers);
drivers/usb/gadget/legacy/acm_ms.c +0 -4
@@ -133,10 +133,6 @@ static int acm_ms_do_config(struct usb_configuration *c)if (status <0 ) goto put_msg; - status =fsg_common_run_thread (opts->common); -if (status) - goto remove_acm; - status =usb_add_function (c, f_msg);if (status) goto remove_acm;
drivers/usb/gadget/legacy/mass_storage.c +0 -4
@@ -132,10 +132,6 @@ static int msg_do_config(struct usb_configuration *c)if (IS_ERR (f_msg))return PTR_ERR (f_msg); - ret =fsg_common_run_thread (opts->common); -if (ret) - goto put_func; - ret =usb_add_function (c, f_msg);if (ret) goto put_func;
drivers/usb/gadget/legacy/multi.c +0 -12
@@ -137,7 +137,6 @@ static struct usb_function *f_msg_rndis;static int rndis_do_config (struct usb_configuration *c) { -struct fsg_opts *fsg_opts;int ret;if (gadget_is_otg (c->cdev->gadget)) {
@@ -169,11 +168,6 @@ static int rndis_do_config(struct usb_configuration *c) goto err_fsg; } - fsg_opts =fsg_opts_from_func_inst (fi_msg); - ret =fsg_common_run_thread (fsg_opts->common); -if (ret) - goto err_run; - ret =usb_add_function (c, f_msg_rndis);if (ret) goto err_run;
@@ -225,7 +219,6 @@ static struct usb_function *f_msg_multi;static int cdc_do_config (struct usb_configuration *c) { -struct fsg_opts *fsg_opts;int ret;if (gadget_is_otg (c->cdev->gadget)) {
@@ -258,11 +251,6 @@ static int cdc_do_config(struct usb_configuration *c) goto err_fsg; } - fsg_opts =fsg_opts_from_func_inst (fi_msg); - ret =fsg_common_run_thread (fsg_opts->common); -if (ret) - goto err_run; - ret =usb_add_function (c, f_msg_multi);if (ret) goto err_run;
drivers/usb/gadget/legacy/nokia.c +0 -7
@@ -152,7 +152,6 @@ static int nokia_bind_config(struct usb_configuration *c)struct usb_function *f_ecm;struct usb_function *f_obex2 =NULL ;struct usb_function *f_msg; -struct fsg_opts *fsg_opts;int status =0 ;int obex1_stat =-1 ;int obex2_stat =-1 ;
@@ -222,12 +221,6 @@ static int nokia_bind_config(struct usb_configuration *c) goto err_ecm; } - fsg_opts =fsg_opts_from_func_inst (fi_msg); - - status =fsg_common_run_thread (fsg_opts->common); -if (status) - goto err_msg; - status =usb_add_function (c, f_msg);if (status) goto err_msg;
drivers/usb/gadget/udc/udc-core.c +1 -1
@@ -75,7 +75,7 @@ int usb_gadget_map_request(struct usb_gadget *gadget, mapped =dma_map_sg (dev, req->sg, req->num_sgs, is_in ?DMA_TO_DEVICE :DMA_FROM_DEVICE );if (mapped ==0 ) { -dev_err (&gadget->dev,"failed to map SGs\n" ); +dev_err (dev,"failed to map SGs\n" );return -EFAULT ; }
drivers/usb/host/Kconfig +2 -1
@@ -35,6 +35,7 @@ config USB_XHCI_PCI config USB_XHCI_PLATFORM tristate "Generic xHCI driver for a platform device" + select USB_XHCI_RCAR if ARCH_RENESAS ---help--- Adds an xHCI host driver for a generic platform device, which provides a memory space and an irq.
@@ -63,7 +64,7 @@ config USB_XHCI_MVEBU config USB_XHCI_RCAR tristate "xHCI support for Renesas R-Car SoCs" - select USB_XHCI_PLATFORM + depends on USB_XHCI_PLATFORM depends on ARCH_RENESAS || COMPILE_TEST ---help--- Say 'Y' to enable the support for the xHCI host controller
drivers/usb/misc/usbtest.c +3 -1
@@ -529,6 +529,7 @@ static struct scatterlist * alloc_sglist(int nents, int max, int vary, struct usbtest_dev *dev, int pipe) { struct scatterlist *sg; +unsigned int n_size =0 ;unsigned i;unsigned size = max; unsigned maxpacket =
@@ -561,7 +562,8 @@ alloc_sglist(int nents, int max, int vary, struct usbtest_dev *dev, int pipe)break ;case 1 :for (j =0 ; j < size; j++) - *buf++ = (u8) ((j % maxpacket) %63 ); + *buf++ = (u8) (((j + n_size) % maxpacket) %63 ); + n_size += size;break ; }
drivers/usb/serial/cp210x.c +1 -2
@@ -971,8 +971,7 @@ static void cp210x_set_termios(struct tty_struct *tty, }else { modem_ctl[0 ] &= ~0x7B ; modem_ctl[0 ] |=0x01 ; -/* FIXME - OR here instead of assignment looks wrong */ - modem_ctl[4 ] |=0x40 ; + modem_ctl[4 ] =0x40 ;dev_dbg (dev,"%s - flow control = NONE\n" , __func__); }
drivers/usb/serial/io_edgeport.c +38 -18
97 lines not on this page · raw message
drivers/usb/serial/keyspan.c +4 -0
@@ -2376,6 +2376,10 @@ static void keyspan_release(struct usb_serial *serial) s_priv =usb_get_serial_data (serial); +/* Make sure to unlink the URBs submitted in attach. */ +usb_kill_urb (s_priv->instat_urb); +usb_kill_urb (s_priv->indat_urb); +usb_free_urb (s_priv->instat_urb);usb_free_urb (s_priv->indat_urb);usb_free_urb (s_priv->glocont_urb);
drivers/usb/serial/mxuport.c +10 -0
@@ -1259,6 +1259,15 @@ static int mxuport_attach(struct usb_serial *serial)return 0 ; } +static void mxuport_release (struct usb_serial *serial) +{ +struct usb_serial_port *port0 = serial->port[0 ]; +struct usb_serial_port *port1 = serial->port[1 ]; + +usb_serial_generic_close (port1); +usb_serial_generic_close (port0); +} +static int mxuport_open (struct tty_struct *tty,struct usb_serial_port *port) {struct mxuport_port *mxport =usb_get_serial_port_data (port);
@@ -1361,6 +1370,7 @@ static struct usb_serial_driver mxuport_device = { .probe = mxuport_probe, .port_probe = mxuport_port_probe, .attach = mxuport_attach, + .release = mxuport_release, .calc_num_ports = mxuport_calc_num_ports, .open = mxuport_open, .close = mxuport_close,
drivers/usb/serial/option.c +148 -7
192 lines not on this page · raw message
drivers/usb/serial/quatech2.c +1 -0
@@ -141,6 +141,7 @@ static void qt2_release(struct usb_serial *serial) serial_priv =usb_get_serial_data (serial); +usb_kill_urb (serial_priv->read_urb);usb_free_urb (serial_priv->read_urb);kfree (serial_priv->read_buffer);kfree (serial_priv);
drivers/watchdog/sp5100_tco.c +10 -5
@@ -73,6 +73,13 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started."/* * Some TCO specific functions */ + +static bool tco_has_sp5100_reg_layout (struct pci_dev *dev) +{ +return dev->device ==PCI_DEVICE_ID_ATI_SBX00_SMBUS && + dev->revision <0x40 ; +} +static void tco_timer_start (void ) {u32 val;
@@ -129,7 +136,7 @@ static void tco_timer_enable(void) {int val; -if (sp5100_tco_pci->revision >=0x40 ) { +if (!tco_has_sp5100_reg_layout (sp5100_tco_pci)) {/* For SB800 or later */ /* Set the Watchdog timer resolution to 1 sec */ outb (SB800_PM_WATCHDOG_CONFIG ,SB800_IO_PM_INDEX_REG );
@@ -342,8 +349,7 @@ static unsigned char sp5100_tco_setupdevice(void)/* * Determine type of southbridge chipset. */ -if (sp5100_tco_pci->device ==PCI_DEVICE_ID_ATI_SBX00_SMBUS && - sp5100_tco_pci->revision <0x40 ) { +if (tco_has_sp5100_reg_layout (sp5100_tco_pci)) { dev_name =SP5100_DEVNAME ; index_reg =SP5100_IO_PM_INDEX_REG ; data_reg =SP5100_IO_PM_DATA_REG ;
@@ -388,8 +394,7 @@ static unsigned char sp5100_tco_setupdevice(void)* Secondly, Find the watchdog timer MMIO address * from SBResource_MMIO register. */ -if (sp5100_tco_pci->device ==PCI_DEVICE_ID_ATI_SBX00_SMBUS && - sp5100_tco_pci->revision <0x40 ) { +if (tco_has_sp5100_reg_layout (sp5100_tco_pci)) {/* Read SBResource_MMIO from PCI config(PCI_Reg: 9Ch) */ pci_read_config_dword (sp5100_tco_pci,SP5100_SB_RESOURCE_MMIO_BASE , &val);
drivers/watchdog/watchdog_dev.c +0 -1
@@ -736,7 +736,6 @@ static int watchdog_release(struct inode *inode, struct file *file)watchdog_ping (wdd); } -cancel_delayed_work_sync (&wd_data->work);watchdog_update_worker (wdd);/* make sure that /dev/watchdog can be re-opened */
fs/btrfs/ctree.h +1 -0
@@ -4122,6 +4122,7 @@ void btrfs_test_inode_set_ops(struct inode *inode);/* ioctl.c */ long btrfs_ioctl (struct file *file,unsigned int cmd,unsigned long arg); +long btrfs_compat_ioctl (struct file *file,unsigned int cmd,unsigned long arg);int btrfs_ioctl_get_supported_features (void __user *arg);void btrfs_update_iflags (struct inode *inode);void btrfs_inherit_iflags (struct inode *inode,struct inode *dir);
fs/btrfs/file.c +18 -11
@@ -1596,6 +1596,13 @@ again: copied =btrfs_copy_from_user (pos, write_bytes, pages, i); + num_sectors =BTRFS_BYTES_TO_BLKS (root->fs_info, + reserve_bytes); + dirty_sectors =round_up (copied + sector_offset, + root->sectorsize); + dirty_sectors =BTRFS_BYTES_TO_BLKS (root->fs_info, + dirty_sectors); +/* * if we have trouble faulting in the pages, fall * back to one page at a time
@@ -1605,6 +1612,7 @@ again:if (copied ==0 ) { force_page_uptodate = true; + dirty_sectors =0 ; dirty_pages =0 ; }else { force_page_uptodate = false;
@@ -1615,20 +1623,19 @@ again:/* * If we had a short copy we need to release the excess delaloc * bytes we reserved. We need to increment outstanding_extents -* because btrfs_delalloc_release_space will decrement it, but +* because btrfs_delalloc_release_space and +* btrfs_delalloc_release_metadata will decrement it, but * we still have an outstanding extent for the chunk we actually * managed to copy. */ - num_sectors =BTRFS_BYTES_TO_BLKS (root->fs_info, - reserve_bytes); - dirty_sectors =round_up (copied + sector_offset, - root->sectorsize); - dirty_sectors =BTRFS_BYTES_TO_BLKS (root->fs_info, - dirty_sectors); -if (num_sectors > dirty_sectors) { - release_bytes = (write_bytes - copied) - & ~((u64 )root->sectorsize -1 ); +/* +* we round down because we don't want to count +* any partial blocks actually sent through the +* IO machines +*/ + release_bytes =round_down (release_bytes - copied, + root->sectorsize);if (copied >0 ) {spin_lock (&BTRFS_I (inode)->lock);BTRFS_I (inode)->outstanding_extents++;
@@ -2956,7 +2963,7 @@ const struct file_operations btrfs_file_operations = { .fallocate = btrfs_fallocate, .unlocked_ioctl = btrfs_ioctl, #ifdef CONFIG_COMPAT - .compat_ioctl = btrfs_ioctl, + .compat_ioctl = btrfs_compat_ioctl, #endif .copy_file_range = btrfs_copy_file_range, .clone_file_range = btrfs_clone_file_range,
fs/btrfs/inode.c +1 -1
@@ -10184,7 +10184,7 @@ static const struct file_operations btrfs_dir_file_operations = { .iterate = btrfs_real_readdir, .unlocked_ioctl = btrfs_ioctl, #ifdef CONFIG_COMPAT - .compat_ioctl = btrfs_ioctl, + .compat_ioctl = btrfs_compat_ioctl, #endif .release = btrfs_release_file, .fsync = btrfs_sync_file,
fs/btrfs/ioctl.c +21 -0
@@ -5552,3 +5552,24 @@ long btrfs_ioctl(struct file *file, unsigned intreturn -ENOTTY ; } + +#ifdef CONFIG_COMPAT +long btrfs_compat_ioctl (struct file *file,unsigned int cmd,unsigned long arg) +{ +switch (cmd) { +case FS_IOC32_GETFLAGS : + cmd =FS_IOC_GETFLAGS ; +break ; +case FS_IOC32_SETFLAGS : + cmd =FS_IOC_SETFLAGS ; +break ; +case FS_IOC32_GETVERSION : + cmd =FS_IOC_GETVERSION ; +break ; +default : +return -ENOIOCTLCMD ; + } + +return btrfs_ioctl (file, cmd, (unsigned long )compat_ptr (arg)); +} +#endif
fs/cifs/sess.c +80 -59
143 lines not on this page · raw message
fs/crypto/keyinfo.c +76 -44
120 lines not on this page · raw message
fs/hpfs/super.c +32 -10
42 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.