Linux 4.9.211
Greg KH
maintainerI'm announcing the release of the 4.9.211 kernel.
All users of the 4.9 kernel series must upgrade.
The updated 4.9.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.9.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/ABI/testing/sysfs-bus-mei | 2 Makefile | 2 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 8 arch/arm64/include/asm/kvm_mmu.h | 5 arch/arm64/include/asm/pgtable.h | 1 arch/arm64/kernel/hibernate.c | 3 arch/arm64/mm/mmu.c | 102 ++++++---- arch/hexagon/include/asm/atomic.h | 8 arch/hexagon/include/asm/bitops.h | 8 arch/hexagon/include/asm/cmpxchg.h | 2 arch/hexagon/include/asm/futex.h | 6 arch/hexagon/include/asm/spinlock.h | 20 - arch/hexagon/kernel/stacktrace.c | 4 arch/hexagon/kernel/vm_entry.S | 2 arch/mips/boot/compressed/Makefile | 3 arch/powerpc/platforms/powernv/pci.c | 17 + arch/x86/boot/compressed/head_64.S | 5 block/blk-settings.c | 2 drivers/block/xen-blkfront.c | 4 drivers/clk/clk.c | 10 drivers/clk/samsung/clk-exynos5420.c | 2 drivers/dma/ioat/dma.c | 3 drivers/gpio/gpio-mpc8xxx.c | 1 drivers/gpio/gpiolib.c | 5 drivers/hid/hidraw.c | 7 drivers/hid/uhid.c | 5 drivers/iio/imu/adis16480.c | 6 drivers/iio/industrialio-buffer.c | 6 drivers/infiniband/ulp/srpt/ib_srpt.c | 24 ++ drivers/iommu/iommu.c | 1 drivers/md/dm-snap-persistent.c | 2 drivers/md/raid0.c | 2 drivers/media/platform/exynos4-is/fimc-isp-video.c | 2 drivers/media/usb/zr364xx/zr364xx.c | 3 drivers/message/fusion/mptctl.c | 213 ++++----------------- drivers/misc/enclosure.c | 3 drivers/mtd/spi-nor/spi-nor.c | 2 drivers/net/ethernet/stmicro/stmmac/common.h | 4 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 drivers/net/macvlan.c | 5 drivers/net/usb/lan78xx.c | 1 drivers/net/usb/r8152.c | 3 drivers/net/wan/fsl_ucc_hdlc.c | 2 drivers/net/wimax/i2400m/op-rfkill.c | 1 drivers/net/wireless/realtek/rtlwifi/regd.c | 2 drivers/net/wireless/rsi/rsi_91x_mac80211.c | 1 drivers/net/wireless/st/cw1200/fwio.c | 6 drivers/pci/pcie/ptm.c | 2 drivers/platform/x86/asus-wmi.c | 8 drivers/rtc/rtc-msm6242.c | 3 drivers/rtc/rtc-mt6397.c | 47 +++- drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 drivers/scsi/cxgbi/libcxgbi.c | 3 drivers/scsi/esas2r/esas2r_flash.c | 1 drivers/scsi/fnic/vnic_dev.c | 30 +- drivers/scsi/qla4xxx/ql4_mbx.c | 3 drivers/scsi/scsi_trace.c | 113 +++-------- drivers/scsi/sd.c | 4 drivers/spi/spi-atmel.c | 10 drivers/target/target_core_fabric_lib.c | 2 drivers/tty/serial/imx.c | 2 drivers/tty/serial/pch_uart.c | 5 drivers/usb/core/hub.c | 1 drivers/usb/serial/ch341.c | 6 drivers/usb/serial/io_edgeport.c | 33 +-- drivers/usb/serial/keyspan.c | 4 drivers/usb/serial/opticon.c | 2 drivers/usb/serial/quatech2.c | 6 drivers/usb/serial/usb-serial-simple.c | 2 drivers/usb/serial/usb-serial.c | 3 firmware/Makefile | 2 fs/cifs/smb2file.c | 2 fs/ext4/inode.c | 15 + fs/ext4/super.c | 60 +++-- fs/f2fs/data.c | 2 fs/f2fs/file.c | 2 fs/ocfs2/journal.c | 8 fs/reiserfs/xattr.c | 8 include/dt-bindings/reset/amlogic,meson8b-reset.h | 6 include/linux/blkdev.h | 8 include/linux/poll.h | 4 include/linux/regulator/ab8500.h | 2 include/net/cfg80211.h | 11 + mm/page-writeback.c | 4 net/batman-adv/distributed-arp-table.c | 4 net/core/ethtool.c | 16 - net/dccp/feat.c | 7 net/dsa/tag_qca.c | 3 net/hsr/hsr_device.c | 2 net/ipv4/netfilter/arp_tables.c | 19 - net/ipv4/tcp_input.c | 7 net/mac80211/cfg.c | 55 ----- net/mac80211/sta_info.c | 4 net/netfilter/ipset/ip_set_bitmap_gen.h | 2 net/socket.c | 1 net/wireless/rdev-ops.h | 4 net/wireless/util.c | 47 ++++ sound/core/seq/seq_timer.c | 14 - tools/perf/builtin-report.c | 5 tools/perf/util/hist.h | 4 tools/perf/util/probe-finder.c | 32 --- tools/testing/selftests/rseq/settings | 1 102 files changed, 619 insertions(+), 564 deletions(-)
Alexander Lobakin (1):
net: dsa: tag_qca: fix doubled Tx statistics
Alexander Usyskin (1):
mei: fix modalias documentation
[email protected] (1):
ioat: ioat_alloc_ring() failure handling.
Alexandru Ardelean (1):
iio: imu: adis16480: assign bias value only if operation succeeded
Andy Shevchenko (1):
scsi: fnic: use kernel's '%pM' format option to print MAC
Ard Biesheuvel (2):
arm64: mm: BUG on unsupported manipulations of live kernel mappings x86/efistub: Disable paging at mixed mode entry
Arnd Bergmann (4):
ethtool: reduce stack usage with clang
fs/select: avoid clang stack usage warning
compat_ioctl: handle SIOCOUTQNSD
scsi: fnic: fix invalid stack access
Barret Rhoden (1):
ext4: fix use-after-free race with debug_want_extra_isize
Bart Van Assche (3):
RDMA/srpt: Report the SCSI residual to the initiator
scsi: target: core: Fix a pr_debug() argument
scsi: core: scsi_trace: Use get_unaligned_be*()
Ben Hutchings (1):
arm64: mm: Change page table pointer name in p[md]_set_huge()
Bjorn Helgaas (1):
PCI/PTM: Remove spurious "d" from granularity message
Chao Yu (1):
f2fs: fix potential overflow
Colin Ian King (1):
net/wan/fsl_ucc_hdlc: fix out of bounds write on array utdm_info
Cong Wang (1):
netfilter: fix a use-after-free in mtype_destroy()
Dan Carpenter (3):
scsi: mptfusion: Fix double fetch bug in ioctl
cw1200: Fix a signedness bug in cw1200_load_firmware()
scsi: esas2r: unlock on error in esas2r_nvram_read_direct()
Dedy Lansky (1):
cfg80211/mac80211: make ieee80211_send_layer2_update a public function
Dinh Nguyen (1):
arm64: dts: agilex/stratix10: fix pmu interrupt numbers
Eric Dumazet (2):
macvlan: use skb_reset_mac_header() in macvlan_queue_xmit()
net: usb: lan78xx: limit size of local TSO packets
Fabian Henneke (1):
hidraw: Return EPOLLOUT from hidraw_poll
Felix Fietkau (1):
cfg80211: fix page refcount issue in A-MSDU decap
Florian Westphal (1):
netfilter: arp_tables: init netns pointer in xt_tgdtor_param struct
Geert Uytterhoeven (1):
gpio: Fix error message on out-of-range GPIO in lookup table
Greg Kroah-Hartman (1):
Linux 4.9.211
Guenter Roeck (1):
clk: Don't try to enable critical clocks if prepare failed
James Bottomley (1):
scsi: enclosure: Fix stale device oops with hot replug
Jari Ruusu (1):
Fix built-in early-load Intel microcode alignment
Jeff Mahoney (1):
reiserfs: fix handling of -EOPNOTSUPP in reiserfs_for_each_xattr
Jerónimo Borque (1):
USB: serial: simple: Add Motorola Solutions TETRA MTP3xxx and MTP85xx
Jian-Hong Pan (1):
platform/x86: asus-wmi: Fix keyboard brightness cannot be set to 0
Jin Yao (1):
perf report: Fix incorrectly added dimensions as switch perf data file
Jiri Kosina (1):
HID: hidraw, uhid: Always report EPOLLOUT
Johan Hovold (8):
USB: serial: opticon: fix control-message timeouts
USB: serial: suppress driver bind attributes
USB: serial: ch341: handle unbound port at reset_resume
USB: serial: io_edgeport: add missing active-port sanity check
USB: serial: quatech2: handle unbound ports
USB: serial: io_edgeport: handle unbound ports on URB completion
USB: serial: keyspan: handle unbound ports
r8152: add missing endpoint sanity check
Johannes Berg (1):
cfg80211: check for set_wiphy_params
John Ogness (1):
USB: serial: io_edgeport: use irqsave() in USB's complete callback
Johnson CH Chen (陳昭勳) (1):
gpio: mpc8xxx: Add platform device to gpiochip->parent
Jon Derrick (1):
iommu: Remove device link to group on failure
Jose Abreu (2):
net: stmmac: 16KB buffer must be 16 byte aligned
net: stmmac: Enable 16KB buffer size
Jouni Hogander (1):
MIPS: Prevent link failure with kcov instrumentation
Jouni Malinen (1):
mac80211: Do not send Layer 2 Update frame before authorization
Kai Li (1):
ocfs2: call journal flush to mark journal as empty after journal recovery when mount
Kars de Jong (1):
rtc: msm6242: Fix reading of 10-hour digit
Keiya Nobuta (1):
usb: core: hub: Improved device recognition on remote wakeup
Kristina Martsenko (1):
arm64: don't open code page table entry creation
Lars Möllendorf (1):
iio: buffer: align the size of scan bytes to size of the largest element
Laura Abbott (1):
arm64: Make sure permission updates happen for pmd/pud
Mans Rullgard (1):
spi: atmel: fix handling of cs_change set on non-last xfer
Marcel Holtmann (1):
HID: hidraw: Fix returning EPOLLOUT from hidraw_poll
Marian Mihailescu (1):
clk: samsung: exynos5420: Preserve CPU clocks configuration during suspend/resume
Martin Blumenstingl (1):
dt-bindings: reset: meson8b: fix duplicate reset IDs
Masami Hiramatsu (1):
perf probe: Fix wrong address verification
Mathieu Desnoyers (1):
rseq/selftests: Turn off timeout setting
Mikulas Patocka (1):
block: fix an integer overflow in logical block size
Nathan Chancellor (3):
cifs: Adjust indentation in smb2_open_file
rtlwifi: Remove unnecessary NULL check in rtl_regd_init xen/blkfront: Adjust indentation in xlvbd_alloc_gendisk
Navid Emamdoost (2):
wimax: i2400: fix memory leak
wimax: i2400: Fix memory leak in i2400m_op_rfkill_sw_toggle
Nick Desaulniers (2):
hexagon: parenthesize registers in asm predicates
hexagon: work around compiler crash
Oliver O'Halloran (1):
powerpc/powernv: Disable native PCIe port management
Pan Bian (2):
scsi: qla4xxx: fix double free bug
scsi: bnx2i: fix potential use after free
Peng Fan (2):
tty: serial: imx: use the sg count from dma_map_sg
tty: serial: pch_uart: correct usage of dma_unmap_sg
Pengcheng Yang (1):
tcp: fix marked lost packets not being retransmitted
Ran Bi (1):
rtc: mt6397: fix alarm register overwrite
Sanjay Konduri (1):
rsi: add fix for crash during assertions
Sergei Shtylyov (1):
mtd: spi-nor: fix silent truncation in spi_nor_read()
Seung-Woo Kim (1):
media: exynos4-is: Fix recursive locking in isp_video_release()
Stephan Gerhold (1):
regulator: ab8500: Remove SYSCLKREQ from enum ab8505_regulator_id
Sven Eckelmann (1):
batman-adv: Fix DAT candidate selection on little endian systems
Taehee Yoo (1):
hsr: reset network header when supervision frame is created
Takashi Iwai (1):
ALSA: seq: Fix racy access for queue timer in proc read
Theodore Ts'o (1):
ext4: add more paranoia checking in ext4_expand_extra_isize handling
Vandana BN (1):
media: usb:zr364xx:Fix KASAN:null-ptr-deref Read in zr364xx_vidioc_querycap
Varun Prakash (1):
scsi: libcxgbi: fix NULL pointer dereference in cxgbi_device_destroy()
Wen Yang (1):
mm/page-writeback.c: avoid potential division by zero in wb_min_max_ratio()
Will Deacon (1):
arm64: Enforce BBM for huge IO/VMAP mappings
Xiang Chen (1):
scsi: sd: Clear sdkp->protection_type if disk is reformatted without PI
YueHaibing (1):
dccp: Fix memleak in __feat_register_sp
Yuya Fujita (1):
perf hists: Fix variable name's inconsistency in hists__for_each() macro
Greg KH
maintainerDocumentation/ABI/testing/sysfs-bus-mei +1 -1
@@ -4,7 +4,7 @@ KernelVersion: 3.10 Contact: Samuel Ortiz <[email protected]> [email protected] Description: Stores the same MODALIAS value emitted by uevent - Format: mei:<mei device name>:<device uuid>: + Format: mei:<mei device name>:<device uuid>:<protocol version> What: /sys/bus/mei/devices/.../name Date: May 2015
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 9 -SUBLEVEL = 210 +SUBLEVEL = 211 EXTRAVERSION = NAME = Roaring Lionus
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +4 -4
@@ -56,10 +56,10 @@ pmu { compatible = "arm,armv8-pmuv3"; - interrupts = <0 120 8>, - <0 121 8>, - <0 122 8>, - <0 123 8>; + interrupts = <0 170 4>, + <0 171 4>, + <0 172 4>, + <0 173 4>; interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>,
arch/arm64/include/asm/kvm_mmu.h +5 -0
@@ -300,6 +300,11 @@ static inline bool __kvm_cpu_uses_extended_idmap(void)return __cpu_uses_extended_idmap (); } +/* +* Can't use pgd_populate here, because the extended idmap adds an extra level +* above CONFIG_PGTABLE_LEVELS (which is 2 or 3 if we're using the extended +* idmap), and pgd_populate is only available if CONFIG_PGTABLE_LEVELS = 4. +*/ static inline void __kvm_extend_hypmap(pgd_t *boot_hyp_pgd, pgd_t *hyp_pgd, pgd_t *merged_hyp_pgd,
arch/arm64/include/asm/pgtable.h +1 -0
@@ -353,6 +353,7 @@ static inline int pmd_protnone(pmd_t pmd)#define pud_write (pud) pte_write(pud_pte(pud))#define pud_pfn (pud) (((pud_val(pud) & PUD_MASK) & PHYS_MASK) >> PAGE_SHIFT) +#define pfn_pud (pfn,prot) (__pud(((phys_addr_t)(pfn) << PAGE_SHIFT) | pgprot_val(prot)))#define set_pmd_at (mm, addr, pmdp, pmd) set_pte_at(mm, addr, (pte_t *)pmdp, pmd_pte(pmd))
arch/arm64/kernel/hibernate.c +1 -2
@@ -247,8 +247,7 @@ static int create_safe_exec_page(void *src_start, size_t length, } pte =pte_offset_kernel (pmd, dst_addr); -set_pte (pte,__pte (virt_to_phys ((void *)dst) | -pgprot_val (PAGE_KERNEL_EXEC ))); +set_pte (pte,pfn_pte (virt_to_pfn (dst),PAGE_KERNEL_EXEC ));/* * Load our new page tables. A strict BBM approach requires that we
arch/arm64/mm/mmu.c +68 -34
188 lines not on this page · raw message
arch/hexagon/include/asm/atomic.h +4 -4
@@ -103,7 +103,7 @@ static inline void atomic_##op(int i, atomic_t *v) \"1: %0 = memw_locked(%1);\n" \ " %0 = "#op "(%0,%2);\n" \ " memw_locked(%1,P3)=%0;\n" \ - " if !P3 jump 1b;\n" \ + " if (!P3) jump 1b;\n" \ : "=&r" (output) \ : "r" (&v->counter), "r" (i) \ : "memory", "p3" \
@@ -119,7 +119,7 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \"1: %0 = memw_locked(%1);\n" \ " %0 = "#op "(%0,%2);\n" \ " memw_locked(%1,P3)=%0;\n" \ - " if !P3 jump 1b;\n" \ + " if (!P3) jump 1b;\n" \ : "=&r" (output) \ : "r" (&v->counter), "r" (i) \ : "memory", "p3" \
@@ -136,7 +136,7 @@ static inline int atomic_fetch_##op(int i, atomic_t *v) \"1: %0 = memw_locked(%2);\n" \ " %1 = "#op "(%0,%3);\n" \ " memw_locked(%2,P3)=%1;\n" \ - " if !P3 jump 1b;\n" \ + " if (!P3) jump 1b;\n" \ : "=&r" (output), "=&r" (val) \ : "r" (&v->counter), "r" (i) \ : "memory", "p3" \
@@ -185,7 +185,7 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)" }" " memw_locked(%2, p3) = %1;" " {" -" if !p3 jump 1b;" +" if (!p3) jump 1b;" " }" "2:" : "=&r" (__oldval), "=&r" (tmp)
arch/hexagon/include/asm/bitops.h +4 -4
@@ -52,7 +52,7 @@ static inline int test_and_clear_bit(int nr, volatile void *addr)"1: R12 = memw_locked(R10);\n" " { P0 = tstbit(R12,R11); R12 = clrbit(R12,R11); }\n" " memw_locked(R10,P1) = R12;\n" -" {if !P1 jump 1b; %0 = mux(P0,#1,#0);}\n" +" {if (!P1) jump 1b; %0 = mux(P0,#1,#0);}\n" : "=&r" (oldval) : "r" (addr), "r" (nr) : "r10", "r11", "r12", "p0", "p1", "memory"
@@ -76,7 +76,7 @@ static inline int test_and_set_bit(int nr, volatile void *addr)"1: R12 = memw_locked(R10);\n" " { P0 = tstbit(R12,R11); R12 = setbit(R12,R11); }\n" " memw_locked(R10,P1) = R12;\n" -" {if !P1 jump 1b; %0 = mux(P0,#1,#0);}\n" +" {if (!P1) jump 1b; %0 = mux(P0,#1,#0);}\n" : "=&r" (oldval) : "r" (addr), "r" (nr) : "r10", "r11", "r12", "p0", "p1", "memory"
@@ -102,7 +102,7 @@ static inline int test_and_change_bit(int nr, volatile void *addr)"1: R12 = memw_locked(R10);\n" " { P0 = tstbit(R12,R11); R12 = togglebit(R12,R11); }\n" " memw_locked(R10,P1) = R12;\n" -" {if !P1 jump 1b; %0 = mux(P0,#1,#0);}\n" +" {if (!P1) jump 1b; %0 = mux(P0,#1,#0);}\n" : "=&r" (oldval) : "r" (addr), "r" (nr) : "r10", "r11", "r12", "p0", "p1", "memory"
@@ -237,7 +237,7 @@ static inline int ffs(int x)int r; asm("{ P0 = cmp.eq(%1,#0); %0 = ct0(%1);}\n" -"{ if P0 %0 = #0; if !P0 %0 = add(%0,#1);}\n" +"{ if (P0) %0 = #0; if (!P0) %0 = add(%0,#1);}\n" :"=&r" (r) :"r" (x) :"p0" );
arch/hexagon/include/asm/cmpxchg.h +1 -1
@@ -44,7 +44,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, __asm__ __volatile__ ("1: %0 = memw_locked(%1);\n" /* load into retval */ " memw_locked(%1,P0) = %2;\n" /* store into memory */ -" if !P0 jump 1b;\n" +" if (!P0) jump 1b;\n" :"=&r" (retval) :"r" (ptr),"r" (x) : "memory", "p0"
arch/hexagon/include/asm/futex.h +3 -3
@@ -15,7 +15,7 @@/* For example: %1 = %4 */ \ insn \"2: memw_locked(%3,p2) = %1;\n" \ -" if !p2 jump 1b;\n" \ +" if (!p2) jump 1b;\n" \" %1 = #0;\n" \"3:\n" \".section .fixup,\"ax\"\n" \
@@ -83,10 +83,10 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, u32 oldval,"1: %1 = memw_locked(%3)\n" " {\n" " p2 = cmp.eq(%1,%4)\n" -" if !p2.new jump:NT 3f\n" +" if (!p2.new) jump:NT 3f\n" " }\n" "2: memw_locked(%3,p2) = %5\n" -" if !p2 jump 1b\n" +" if (!p2) jump 1b\n" "3:\n" ".section .fixup,\"ax\"\n" "4: %0 = #%6\n"
arch/hexagon/include/asm/spinlock.h +10 -10
@@ -44,9 +44,9 @@ static inline void arch_read_lock(arch_rwlock_t *lock) __asm__ __volatile__("1: R6 = memw_locked(%0);\n" " { P3 = cmp.ge(R6,#0); R6 = add(R6,#1);}\n" -" { if !P3 jump 1b; }\n" +" { if (!P3) jump 1b; }\n" " memw_locked(%0,P3) = R6;\n" -" { if !P3 jump 1b; }\n" +" { if (!P3) jump 1b; }\n" : :"r" (&lock->lock) : "memory", "r6", "p3"
@@ -60,7 +60,7 @@ static inline void arch_read_unlock(arch_rwlock_t *lock) "1: R6 = memw_locked(%0);\n" " R6 = add(R6,#-1);\n" " memw_locked(%0,P3) = R6\n" - " if !P3 jump 1b;\n" + " if (!P3) jump 1b;\n" : : "r" (&lock->lock) : "memory", "r6", "p3"
@@ -75,7 +75,7 @@ static inline int arch_read_trylock(arch_rwlock_t *lock) __asm__ __volatile__(" R6 = memw_locked(%1);\n" " { %0 = #0; P3 = cmp.ge(R6,#0); R6 = add(R6,#1);}\n" -" { if !P3 jump 1f; }\n" +" { if (!P3) jump 1f; }\n" " memw_locked(%1,P3) = R6;\n" " { %0 = P3 }\n" "1:\n"
@@ -102,9 +102,9 @@ static inline void arch_write_lock(arch_rwlock_t *lock) __asm__ __volatile__("1: R6 = memw_locked(%0)\n" " { P3 = cmp.eq(R6,#0); R6 = #-1;}\n" -" { if !P3 jump 1b; }\n" +" { if (!P3) jump 1b; }\n" " memw_locked(%0,P3) = R6;\n" -" { if !P3 jump 1b; }\n" +" { if (!P3) jump 1b; }\n" : :"r" (&lock->lock) : "memory", "r6", "p3"
@@ -118,7 +118,7 @@ static inline int arch_write_trylock(arch_rwlock_t *lock) __asm__ __volatile__(" R6 = memw_locked(%1)\n" " { %0 = #0; P3 = cmp.eq(R6,#0); R6 = #-1;}\n" -" { if !P3 jump 1f; }\n" +" { if (!P3) jump 1f; }\n" " memw_locked(%1,P3) = R6;\n" " %0 = P3;\n" "1:\n"
@@ -141,9 +141,9 @@ static inline void arch_spin_lock(arch_spinlock_t *lock) __asm__ __volatile__("1: R6 = memw_locked(%0);\n" " P3 = cmp.eq(R6,#0);\n" -" { if !P3 jump 1b; R6 = #1; }\n" +" { if (!P3) jump 1b; R6 = #1; }\n" " memw_locked(%0,P3) = R6;\n" -" { if !P3 jump 1b; }\n" +" { if (!P3) jump 1b; }\n" : :"r" (&lock->lock) : "memory", "r6", "p3"
@@ -163,7 +163,7 @@ static inline unsigned int arch_spin_trylock(arch_spinlock_t *lock) __asm__ __volatile__(" R6 = memw_locked(%1);\n" " P3 = cmp.eq(R6,#0);\n" -" { if !P3 jump 1f; R6 = #1; %0 = #0; }\n" +" { if (!P3) jump 1f; R6 = #1; %0 = #0; }\n" " memw_locked(%1,P3) = R6;\n" " %0 = P3;\n" "1:\n"
arch/hexagon/kernel/stacktrace.c +1 -3
@@ -23,8 +23,6 @@#include <linux/thread_info.h> #include <linux/module.h> -registerunsigned long current_frame_pointer asm("r30" ); -struct stackframe {unsigned long fp;unsigned long rets;
@@ -42,7 +40,7 @@ void save_stack_trace(struct stack_trace *trace) low = (unsigned long )task_stack_page (current); high = low +THREAD_SIZE ; - fp = current_frame_pointer; + fp = (unsigned long )__builtin_frame_address (0 );while (fp >= low && fp <= (high -sizeof (*frame))) { frame = (struct stackframe *)fp;
arch/hexagon/kernel/vm_entry.S +1 -1
@@ -382,7 +382,7 @@ ret_from_fork: R26.L = #LO(do_work_pending); R0 = #VM_INT_DISABLE; } - if P0 jump check_work_pending + if (P0) jump check_work_pending { R0 = R25; callr R24
arch/mips/boot/compressed/Makefile +3 -0
@@ -29,6 +29,9 @@ KBUILD_AFLAGS := $(LINUXINCLUDE) $(KBUILD_AFLAGS) -D__ASSEMBLY__ \ -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) \ -DKERNEL_ENTRY=$(VMLINUX_ENTRY_ADDRESS) +# Prevents link failures: __sanitizer_cov_trace_pc() is not linked in. +KCOV_INSTRUMENT := n + # decompressor objects (linked with vmlinuz) vmlinuzobjs-y := $(obj)/head.o $(obj)/decompress.o $(obj)/string.o
arch/powerpc/platforms/powernv/pci.c +17 -0
@@ -923,6 +923,23 @@ void __init pnv_pci_init(void)if (!firmware_has_feature (FW_FEATURE_OPAL ))return ; +#ifdef CONFIG_PCIEPORTBUS +/* +* On PowerNV PCIe devices are (currently) managed in cooperation +* with firmware. This isn't *strictly* required, but there's enough +* assumptions baked into both firmware and the platform code that +* it's unwise to allow the portbus services to be used. +* +* We need to fix this eventually, but for now set this flag to disable +* the portbus driver. The AER service isn't required since that AER +* events are handled via EEH. The pciehp hotplug driver can't work +* without kernel changes (and portbus binding breaks pnv_php). The +* other services also require some thinking about how we're going +* to integrate them. +*/ + pcie_ports_disabled = true; +#endif +/* Look for IODA IO-Hubs. */ for_each_compatible_node (np,NULL ,"ibm,ioda-hub" ) {pnv_pci_init_ioda_hub (np);
arch/x86/boot/compressed/head_64.S +5 -0
@@ -227,6 +227,11 @@ ENTRY(efi32_stub_entry) leal efi32_config(%ebp), %eax movl %eax, efi_config(%ebp) + /* Disable paging */ + movl %cr0, %eax + btrl $X86_CR0_PG_BIT, %eax + movl %eax, %cr0 + jmp startup_32 ENDPROC(efi32_stub_entry) #endif
block/blk-settings.c +1 -1
@@ -349,7 +349,7 @@ EXPORT_SYMBOL(blk_queue_max_segment_size);* storage device can address. The default of 512 covers most * hardware. **/ -void blk_queue_logical_block_size (struct request_queue *q,unsigned short size) +void blk_queue_logical_block_size (struct request_queue *q,unsigned int size) { q->limits.logical_block_size = size;
drivers/block/xen-blkfront.c +2 -2
@@ -1104,8 +1104,8 @@ static int xlvbd_alloc_gendisk(blkif_sector_t capacity,if (!VDEV_IS_EXTENDED (info->vdevice)) { err =xen_translate_vdev (info->vdevice, &minor, &offset);if (err) -return err; - nr_parts =PARTS_PER_DISK ; +return err; + nr_parts =PARTS_PER_DISK ; }else { minor =BLKIF_MINOR_EXT (info->vdevice); nr_parts =PARTS_PER_EXT_DISK ;
drivers/clk/clk.c +8 -2
@@ -2448,11 +2448,17 @@ static int __clk_core_init(struct clk_core *core)if (core->flags &CLK_IS_CRITICAL ) {unsigned long flags; -clk_core_prepare (core); + ret =clk_core_prepare (core); +if (ret) + goto out; flags =clk_enable_lock (); -clk_core_enable (core); + ret =clk_core_enable (core);clk_enable_unlock (flags); +if (ret) { +clk_core_unprepare (core); + goto out; + } }/*
drivers/clk/samsung/clk-exynos5420.c +2 -0
@@ -170,6 +170,8 @@ static const unsigned long exynos5x_clk_regs[] __initconst = {GATE_BUS_CPU ,GATE_SCLK_CPU ,CLKOUT_CMU_CPU , +APLL_CON0 , +KPLL_CON0 ,CPLL_CON0 ,DPLL_CON0 , EPLL_CON0,
drivers/dma/ioat/dma.c +2 -1
@@ -394,10 +394,11 @@ ioat_alloc_ring(struct dma_chan *c, int order, gfp_t flags) descs->virt =dma_alloc_coherent (to_dev (ioat_chan),SZ_2M , &descs->hw, flags); -if (!descs->virt && (i >0 )) { +if (!descs->virt) {int idx;for (idx =0 ; idx < i; idx++) { + descs = &ioat_chan->descs[idx];dma_free_coherent (to_dev (ioat_chan),SZ_2M , descs->virt, descs->hw); descs->virt =NULL ;
drivers/gpio/gpio-mpc8xxx.c +1 -0
@@ -306,6 +306,7 @@ static int mpc8xxx_probe(struct platform_device *pdev)return -ENOMEM ; gc = &mpc8xxx_gc->gc; + gc->parent = &pdev->dev;if (of_property_read_bool (np,"little-endian" )) { ret = bgpio_init(gc, &pdev->dev, 4,
drivers/gpio/gpiolib.c +3 -2
@@ -3049,8 +3049,9 @@ static struct gpio_desc *gpiod_find(struct device *dev, const char *con_id,if (chip->ngpio <= p->chip_hwnum) {dev_err (dev, -"requested GPIO %d is out of range [0..%d] for chip %s\n" , - idx, chip->ngpio, chip->label); +"requested GPIO %u (%u) is out of range [0..%u] for chip %s\n" , + idx, p->chip_hwnum, chip->ngpio -1 , + chip->label);return ERR_PTR (-EINVAL ); }
drivers/hid/hidraw.c +4 -3
@@ -257,13 +257,14 @@ static ssize_t hidraw_get_report(struct file *file, char __user *buffer, size_tstatic unsigned int hidraw_poll (struct file *file,poll_table *wait) {struct hidraw_list *list = file->private_data; +unsigned int mask =POLLOUT |POLLWRNORM ;/* hidraw is always writable */ poll_wait (file, &list->hidraw->wait, wait);if (list->head != list->tail) -return POLLIN |POLLRDNORM ; + mask |=POLLIN |POLLRDNORM ;if (!list->hidraw->exist) -return POLLERR |POLLHUP ; -return 0 ; + mask |=POLLERR |POLLHUP ; +return mask; }static int hidraw_open (struct inode *inode,struct file *file)
drivers/hid/uhid.c +3 -2
@@ -769,13 +769,14 @@ static ssize_t uhid_char_write(struct file *file, const char __user *buffer,static unsigned int uhid_char_poll (struct file *file,poll_table *wait) {struct uhid_device *uhid = file->private_data; +unsigned int mask =POLLOUT |POLLWRNORM ;/* uhid is always writable */ poll_wait (file, &uhid->waitq, wait);if (uhid->head != uhid->tail) -return POLLIN |POLLRDNORM ; + mask |=POLLIN |POLLRDNORM ; -return EPOLLOUT |EPOLLWRNORM ; +return mask; }static const struct file_operations uhid_fops = {
drivers/iio/imu/adis16480.c +4 -2
@@ -372,12 +372,14 @@ static int adis16480_get_calibbias(struct iio_dev *indio_dev,case IIO_MAGN :case IIO_PRESSURE : ret =adis_read_reg_16 (&st->adis, reg, &val16); - *bias =sign_extend32 (val16,15 ); +if (ret ==0 ) + *bias =sign_extend32 (val16,15 );break ;case IIO_ANGL_VEL :case IIO_ACCEL : ret =adis_read_reg_32 (&st->adis, reg, &val32); - *bias =sign_extend32 (val32,31 ); +if (ret ==0 ) + *bias =sign_extend32 (val32,31 );break ;default : ret = -EINVAL ;
drivers/iio/industrialio-buffer.c +5 -1
@@ -546,7 +546,7 @@ static int iio_compute_scan_bytes(struct iio_dev *indio_dev, const unsigned long *mask, bool timestamp) { unsigned bytes = 0; -int length, i; +int length, i, largest =0 ;/* How much space will the demuxed element take? */ for_each_set_bit(i, mask,
@@ -554,13 +554,17 @@ static int iio_compute_scan_bytes(struct iio_dev *indio_dev, length =iio_storage_bytes_for_si (indio_dev, i); bytes =ALIGN (bytes, length); bytes += length; + largest =max (largest, length); }if (timestamp) { length =iio_storage_bytes_for_timestamp (indio_dev); bytes =ALIGN (bytes, length); bytes += length; + largest =max (largest, length); } + + bytes =ALIGN (bytes, largest);return bytes; }
drivers/infiniband/ulp/srpt/ib_srpt.c +24 -0
@@ -1234,9 +1234,11 @@ static int srpt_build_cmd_rsp(struct srpt_rdma_ch *ch, struct srpt_send_ioctx *ioctx, u64 tag, int status) { + struct se_cmd *cmd = &ioctx->cmd;struct srp_rsp *srp_rsp;const u8 *sense_data;int sense_data_len, max_sense_len; +u32 resid = cmd->residual_count;/* * The lowest bit of all SAM-3 status codes is zero (see also
@@ -1258,6 +1260,28 @@ static int srpt_build_cmd_rsp(struct srpt_rdma_ch *ch, srp_rsp->tag = tag; srp_rsp->status = status; +if (cmd->se_cmd_flags &SCF_UNDERFLOW_BIT ) { +if (cmd->data_direction ==DMA_TO_DEVICE ) { +/* residual data from an underflow write */ + srp_rsp->flags =SRP_RSP_FLAG_DOUNDER ; + srp_rsp->data_out_res_cnt =cpu_to_be32 (resid); + }else if (cmd->data_direction ==DMA_FROM_DEVICE ) { +/* residual data from an underflow read */ + srp_rsp->flags =SRP_RSP_FLAG_DIUNDER ; + srp_rsp->data_in_res_cnt =cpu_to_be32 (resid); + } + }else if (cmd->se_cmd_flags &SCF_OVERFLOW_BIT ) { +if (cmd->data_direction ==DMA_TO_DEVICE ) { +/* residual data from an overflow write */ + srp_rsp->flags =SRP_RSP_FLAG_DOOVER ; + srp_rsp->data_out_res_cnt =cpu_to_be32 (resid); + }else if (cmd->data_direction ==DMA_FROM_DEVICE ) { +/* residual data from an overflow read */ + srp_rsp->flags =SRP_RSP_FLAG_DIOVER ; + srp_rsp->data_in_res_cnt =cpu_to_be32 (resid); + } + } +if (sense_data_len) {BUILD_BUG_ON (MIN_MAX_RSP_SIZE <=sizeof (*srp_rsp)); max_sense_len = ch->max_ti_iu_len -sizeof (*srp_rsp);
drivers/iommu/iommu.c +1 -0
@@ -439,6 +439,7 @@ int iommu_group_add_device(struct iommu_group *group, struct device *dev)mutex_unlock (&group->mutex); dev->iommu_group =NULL ;kobject_put (group->devices_kobj); +sysfs_remove_link (group->devices_kobj, device->name); err_free_name:kfree (device->name); err_remove_link:
drivers/md/dm-snap-persistent.c +1 -1
@@ -17,7 +17,7 @@#include "dm-bufio.h" #define DM_MSG_PREFIX "persistent snapshot" -#define DM_CHUNK_SIZE_DEFAULT_SECTORS 32/* 16KB */ +#define DM_CHUNK_SIZE_DEFAULT_SECTORS 32U/* 16KB */ #define DM_PREFETCH_CHUNKS 12
drivers/md/raid0.c +1 -1
@@ -82,7 +82,7 @@ static int create_strip_zones(struct mddev *mddev, struct r0conf **private_conf)char b[BDEVNAME_SIZE ];char b2[BDEVNAME_SIZE ];struct r0conf *conf =kzalloc (sizeof (*conf),GFP_KERNEL ); -unsigned short blksize =512 ; +unsigned blksize =512 ; *private_conf =ERR_PTR (-ENOMEM );if (!conf)
drivers/media/platform/exynos4-is/fimc-isp-video.c +1 -1
@@ -316,7 +316,7 @@ static int isp_video_release(struct file *file) ivc->streaming =0 ; } -vb2_fop_release (file); +_vb2_fop_release (file,NULL );if (v4l2_fh_is_singular_file (file)) {fimc_pipeline_call (&ivc->ve, close);
drivers/media/usb/zr364xx/zr364xx.c +2 -1
@@ -711,7 +711,8 @@ static int zr364xx_vidioc_querycap(struct file *file, void *priv,struct zr364xx_camera *cam =video_drvdata (file);strlcpy (cap->driver,DRIVER_DESC ,sizeof (cap->driver)); -strlcpy (cap->card, cam->udev->product,sizeof (cap->card)); +if (cam->udev->product) +strlcpy (cap->card, cam->udev->product,sizeof (cap->card));strlcpy (cap->bus_info,dev_name (&cam->udev->dev),sizeof (cap->bus_info)); cap->device_caps = V4L2_CAP_VIDEO_CAPTURE |
drivers/message/fusion/mptctl.c +50 -163
488 lines not on this page · raw message
drivers/misc/enclosure.c +1 -2
@@ -419,10 +419,9 @@ int enclosure_remove_device(struct enclosure_device *edev, struct device *dev) cdev = &edev->component[i];if (cdev->dev == dev) {enclosure_remove_links (cdev); -device_del (&cdev->cdev);put_device (dev); cdev->dev =NULL ; -return device_add (&cdev->cdev); +return 0 ; } }return -ENODEV ;
drivers/mtd/spi-nor/spi-nor.c +1 -1
@@ -1046,7 +1046,7 @@ static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf) { struct spi_nor *nor = mtd_to_spi_nor(mtd); -int ret; +ssize_t ret;dev_dbg (nor->dev,"from 0x%08x, len %zd\n" , (u32 )from, len);
drivers/net/ethernet/stmicro/stmmac/common.h +2 -2
@@ -326,8 +326,8 @@ struct dma_features {unsigned int enh_desc; }; -/* GMAC TX FIFO is 8K, Rx FIFO is 16K */ -#define BUF_SIZE_16KiB 16384 +/* RX Buffer size must be multiple of 4/8/16 bytes */ +#define BUF_SIZE_16KiB 16368#define BUF_SIZE_8KiB 8192#define BUF_SIZE_4KiB 4096#define BUF_SIZE_2KiB 2048
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +3 -1
@@ -929,7 +929,9 @@ static int stmmac_set_bfsize(int mtu, int bufsize) {int ret = bufsize; -if (mtu >= BUF_SIZE_4KiB) +if (mtu >= BUF_SIZE_8KiB) + ret = BUF_SIZE_16KiB; +else if (mtu >= BUF_SIZE_4KiB) ret = BUF_SIZE_8KiB;else if (mtu >= BUF_SIZE_2KiB) ret = BUF_SIZE_4KiB;
drivers/net/macvlan.c +3 -2
@@ -234,7 +234,7 @@ static void macvlan_broadcast(struct sk_buff *skb, struct net_device *src, enum macvlan_mode mode) { -const struct ethhdr *eth =skb_eth_hdr (skb); +const struct ethhdr *eth =eth_hdr (skb);const struct macvlan_dev *vlan;struct sk_buff *nskb;unsigned int i;
@@ -487,10 +487,11 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev)const struct macvlan_dev *dest;if (vlan->mode ==MACVLAN_MODE_BRIDGE ) { -const struct ethhdr *eth = (void *)skb->data; +const struct ethhdr *eth =skb_eth_hdr (skb);/* send to other bridge ports directly */ if (is_multicast_ether_addr (eth->h_dest)) { +skb_reset_mac_header (skb);macvlan_broadcast (skb, port, dev,MACVLAN_MODE_BRIDGE ); goto xmit_world; }
drivers/net/usb/lan78xx.c +1 -0
@@ -3375,6 +3375,7 @@ static int lan78xx_probe(struct usb_interface *intf,if (netdev->mtu > (dev->hard_mtu - netdev->hard_header_len)) netdev->mtu = dev->hard_mtu - netdev->hard_header_len; +netif_set_gso_max_size (netdev,MAX_SINGLE_PACKET_SIZE -MAX_HEADER ); dev->ep_blkin = (intf->cur_altsetting)->endpoint +0 ; dev->ep_blkout = (intf->cur_altsetting)->endpoint +1 ;
drivers/net/usb/r8152.c +3 -0
@@ -4365,6 +4365,9 @@ static int rtl8152_probe(struct usb_interface *intf,return -ENODEV ; } +if (intf->cur_altsetting->desc.bNumEndpoints <3 ) +return -ENODEV ; +usb_reset_device (udev); netdev =alloc_etherdev (sizeof (struct r8152 ));if (!netdev) {
drivers/net/wan/fsl_ucc_hdlc.c +1 -1
@@ -77,7 +77,7 @@ static struct ucc_tdm_info utdm_primary_info = { }, }; -static struct ucc_tdm_info utdm_info[MAX_HDLC_NUM ]; +static struct ucc_tdm_info utdm_info[UCC_MAX_NUM ];static int uhdlc_init (struct ucc_hdlc_private *priv) {
drivers/net/wimax/i2400m/op-rfkill.c +1 -0
@@ -147,6 +147,7 @@ int i2400m_op_rfkill_sw_toggle(struct wimax_dev *wimax_dev, error_alloc:d_fnend (4 , dev,"(wimax_dev %p state %d) = %d\n" , wimax_dev, state, result); +kfree (cmd);return result; }
drivers/net/wireless/realtek/rtlwifi/regd.c +1 -1
@@ -427,7 +427,7 @@ int rtl_regd_init(struct ieee80211_hw *hw,struct wiphy *wiphy = hw->wiphy;struct country_code_to_enum_rd *country =NULL ; -if (wiphy ==NULL || &rtlpriv->regd ==NULL ) +if (!wiphy)return -EINVAL ;/* init country_code from efuse channel plan */
drivers/net/wireless/rsi/rsi_91x_mac80211.c +1 -0
@@ -199,6 +199,7 @@ void rsi_mac80211_detach(struct rsi_hw *adapter)ieee80211_stop_queues (hw);ieee80211_unregister_hw (hw);ieee80211_free_hw (hw); + adapter->hw =NULL ; }rsi_remove_dbgfs (adapter);
drivers/net/wireless/st/cw1200/fwio.c +3 -3
@@ -323,12 +323,12 @@ int cw1200_load_firmware(struct cw1200_common *priv) goto out; } - priv->hw_type =cw1200_get_hw_type (val32, &major_revision); -if (priv->hw_type <0 ) { + ret =cw1200_get_hw_type (val32, &major_revision); +if (ret <0 ) {pr_err ("Can't deduce hardware type.\n" ); - ret = -ENOTSUPP ; goto out; } + priv->hw_type = ret;/* Set DPLL Reg value, and read back to confirm writes work */ ret = cw1200_reg_write_32(priv, ST90TDS_TSET_GEN_R_W_REG_ID,
drivers/pci/pcie/ptm.c +1 -1
@@ -29,7 +29,7 @@ static void pci_ptm_info(struct pci_dev *dev)snprintf (clock_desc,sizeof (clock_desc),">254ns" );break ;default : -snprintf (clock_desc,sizeof (clock_desc),"%udns" , +snprintf (clock_desc,sizeof (clock_desc),"%uns" , dev->ptm_granularity);break ; }
drivers/platform/x86/asus-wmi.c +1 -7
@@ -461,13 +461,7 @@ static void kbd_led_update(struct work_struct *work) asus = container_of(work, struct asus_wmi, kbd_led_work); -/* -* bits 0-2: level -* bit 7: light on/off -*/ -if (asus->kbd_led_wk >0 ) - ctrl_param =0x80 | (asus->kbd_led_wk &0x7F ); - + ctrl_param =0x80 | (asus->kbd_led_wk &0x7F );asus_wmi_set_devstate (ASUS_WMI_DEVID_KBD_BACKLIGHT , ctrl_param,NULL ); }
drivers/rtc/rtc-msm6242.c +2 -1
@@ -132,7 +132,8 @@ static int msm6242_read_time(struct device *dev, struct rtc_time *tm)msm6242_read (priv,MSM6242_SECOND1 ); tm->tm_min =msm6242_read (priv,MSM6242_MINUTE10 ) *10 +msm6242_read (priv,MSM6242_MINUTE1 ); - tm->tm_hour = (msm6242_read (priv,MSM6242_HOUR10 &3 )) *10 + + tm->tm_hour = (msm6242_read (priv,MSM6242_HOUR10 ) & +MSM6242_HOUR10_HR_MASK ) *10 +msm6242_read (priv,MSM6242_HOUR1 ); tm->tm_mday =msm6242_read (priv,MSM6242_DAY10 ) *10 +msm6242_read (priv,MSM6242_DAY1 );
drivers/rtc/rtc-mt6397.c +33 -14
72 lines not on this page · raw message
drivers/scsi/bnx2i/bnx2i_iscsi.c +1 -1
@@ -915,12 +915,12 @@ void bnx2i_free_hba(struct bnx2i_hba *hba)INIT_LIST_HEAD (&hba->ep_ofld_list);INIT_LIST_HEAD (&hba->ep_active_list);INIT_LIST_HEAD (&hba->ep_destroy_list); -pci_dev_put (hba->pcidev);if (hba->regview) {pci_iounmap (hba->pcidev, hba->regview); hba->regview =NULL ; } +pci_dev_put (hba->pcidev);bnx2i_free_mp_bdt (hba);bnx2i_release_free_cid_que (hba);iscsi_host_free (shost);
drivers/scsi/cxgbi/libcxgbi.c +2 -1
@@ -121,7 +121,8 @@ static inline void cxgbi_device_destroy(struct cxgbi_device *cdev) "cdev 0x%p, p# %u.\n", cdev, cdev->nports);cxgbi_hbas_remove (cdev);cxgbi_device_portmap_cleanup (cdev); -cxgbi_ppm_release (cdev->cdev2ppm (cdev)); +if (cdev->cdev2ppm) +cxgbi_ppm_release (cdev->cdev2ppm (cdev));if (cdev->pmap.max_connect)cxgbi_free_big_mem (cdev->pmap.port_csk);kfree (cdev);
drivers/scsi/esas2r/esas2r_flash.c +1 -0
@@ -1197,6 +1197,7 @@ bool esas2r_nvram_read_direct(struct esas2r_adapter *a)if (!esas2r_read_flash_block (a, a->nvram,FLS_OFFSET_NVR ,sizeof (struct esas2r_sas_nvram ))) {esas2r_hdebug ("NVRAM read failed, using defaults" ); +up (&a->nvram_semaphore);return false; }
drivers/scsi/fnic/vnic_dev.c +12 -18
@@ -445,26 +445,26 @@ int vnic_dev_soft_reset_done(struct vnic_dev *vdev, int *done)int vnic_dev_hang_notify (struct vnic_dev *vdev) { -u64 a0, a1; +u64 a0 =0 , a1 =0 ;int wait =1000 ;return vnic_dev_cmd (vdev,CMD_HANG_NOTIFY , &a0, &a1, wait); }int vnic_dev_mac_addr (struct vnic_dev *vdev,u8 *mac_addr) { -u64 a0, a1; +u64 a[2 ] = {};int wait =1000 ;int err, i;for (i =0 ; i <ETH_ALEN ; i++) mac_addr[i] =0 ; - err =vnic_dev_cmd (vdev,CMD_MAC_ADDR , &a0, &a1, wait); + err =vnic_dev_cmd (vdev,CMD_MAC_ADDR , &a[0 ], &a[1 ], wait);if (err)return err;for (i =0 ; i <ETH_ALEN ; i++) - mac_addr[i] = ((u8 *)&a0)[i]; + mac_addr[i] = ((u8 *)&a)[i];return 0 ; }
@@ -489,38 +489,32 @@ void vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,void vnic_dev_add_addr (struct vnic_dev *vdev,u8 *addr) { -u64 a0 =0 , a1 =0 ; +u64 a[2 ] = {};int wait =1000 ;int err;int i;for (i =0 ; i <ETH_ALEN ; i++) - ((u8 *)&a0)[i] = addr[i]; + ((u8 *)&a)[i] = addr[i]; - err =vnic_dev_cmd (vdev,CMD_ADDR_ADD , &a0, &a1, wait); + err =vnic_dev_cmd (vdev,CMD_ADDR_ADD , &a[0 ], &a[1 ], wait);if (err) -printk (KERN_ERR -"Can't add addr [%02x:%02x:%02x:%02x:%02x:%02x], %d\n" , - addr[0 ], addr[1 ], addr[2 ], addr[3 ], addr[4 ], addr[5 ], - err); +pr_err ("Can't add addr [%pM], %d\n" , addr, err); }void vnic_dev_del_addr (struct vnic_dev *vdev,u8 *addr) { -u64 a0 =0 , a1 =0 ; +u64 a[2 ] = {};int wait =1000 ;int err;int i;for (i =0 ; i <ETH_ALEN ; i++) - ((u8 *)&a0)[i] = addr[i]; + ((u8 *)&a)[i] = addr[i]; - err =vnic_dev_cmd (vdev,CMD_ADDR_DEL , &a0, &a1, wait); + err =vnic_dev_cmd (vdev,CMD_ADDR_DEL , &a[0 ], &a[1 ], wait);if (err) -printk (KERN_ERR -"Can't del addr [%02x:%02x:%02x:%02x:%02x:%02x], %d\n" , - addr[0 ], addr[1 ], addr[2 ], addr[3 ], addr[4 ], addr[5 ], - err); +pr_err ("Can't del addr [%pM], %d\n" , addr, err); }int vnic_dev_notify_set (struct vnic_dev *vdev,u16 intr)
drivers/scsi/qla4xxx/ql4_mbx.c +0 -3
@@ -641,9 +641,6 @@ int qla4xxx_initialize_fw_cb(struct scsi_qla_host * ha)if (qla4xxx_get_ifcb (ha, &mbox_cmd[0 ], &mbox_sts[0 ], init_fw_cb_dma) !=QLA_SUCCESS ) { -dma_free_coherent (&ha->pdev->dev, -sizeof (struct addr_ctrl_blk ), - init_fw_cb, init_fw_cb_dma); goto exit_init_fw_cb; }
drivers/scsi/scsi_trace.c +33 -80
169 lines not on this page · raw message
drivers/scsi/sd.c +3 -1
@@ -2005,8 +2005,10 @@ static int sd_read_protection_type(struct scsi_disk *sdkp, unsigned char *bufferu8 type;int ret =0 ; -if (scsi_device_protection (sdp) ==0 || (buffer[12 ] &1 ) ==0 ) +if (scsi_device_protection (sdp) ==0 || (buffer[12 ] &1 ) ==0 ) { + sdkp->protection_type =0 ;return ret; + } type = ((buffer[12 ] >>1 ) &7 ) +1 ;/* P_TYPE 0 = Type 1 */
drivers/spi/spi-atmel.c +3 -7
@@ -315,7 +315,6 @@ struct atmel_spi {struct atmel_spi_dma dma;bool keep_cs; -bool cs_active;u32 fifo_size; };
@@ -1404,11 +1403,9 @@ static int atmel_spi_one_transfer(struct spi_master *master, &msg->transfers)) { as->keep_cs = true; }else { - as->cs_active = !as->cs_active; -if (as->cs_active) -cs_activate (as, msg->spi); -else -cs_deactivate (as, msg->spi); +cs_deactivate (as, msg->spi); +udelay (10 ); +cs_activate (as, msg->spi); } }
@@ -1431,7 +1428,6 @@ static int atmel_spi_transfer_one_message(struct spi_master *master,atmel_spi_lock (as);cs_activate (as, spi); - as->cs_active = true; as->keep_cs = false; msg->status =0 ;
drivers/target/target_core_fabric_lib.c +1 -1
@@ -130,7 +130,7 @@ static int srp_get_pr_transport_id(memset (buf +8 ,0 , leading_zero_bytes); rc =hex2bin (buf +8 + leading_zero_bytes, p, count);if (rc <0 ) { -pr_debug ("hex2bin failed for %s: %d\n" , __func__, rc); +pr_debug ("hex2bin failed for %s: %d\n" , p, rc);return rc; }
drivers/tty/serial/imx.c +1 -1
@@ -548,7 +548,7 @@ static void imx_dma_tx(struct imx_port *sport)dev_err (dev,"DMA mapping error for TX.\n" );return ; } - desc =dmaengine_prep_slave_sg (chan, sgl, sport->dma_tx_nents, + desc =dmaengine_prep_slave_sg (chan, sgl, ret,DMA_MEM_TO_DEV ,DMA_PREP_INTERRUPT );if (!desc) { dma_unmap_sg(dev, sgl, sport->dma_tx_nents,
drivers/tty/serial/pch_uart.c +4 -1
@@ -252,6 +252,7 @@ struct eg20t_port {struct dma_chan *chan_rx;struct scatterlist *sg_tx_p;int nent; +int orig_nent;struct scatterlist sg_rx;int tx_dma_use;void *rx_buf_virt;
@@ -806,9 +807,10 @@ static void pch_dma_tx_complete(void *arg) } xmit->tail &=UART_XMIT_SIZE -1 ;async_tx_ack (priv->desc_tx); -dma_unmap_sg (port->dev, sg, priv->nent,DMA_TO_DEVICE ); +dma_unmap_sg (port->dev, sg, priv->orig_nent,DMA_TO_DEVICE ); priv->tx_dma_use =0 ; priv->nent =0 ; + priv->orig_nent =0 ;kfree (priv->sg_tx_p);pch_uart_hal_enable_interrupt (priv,PCH_UART_HAL_TX_INT ); }
@@ -1033,6 +1035,7 @@ static unsigned int dma_handle_tx(struct eg20t_port *priv)dev_err (priv->port.dev,"%s:dma_map_sg Failed\n" , __func__);return 0 ; } + priv->orig_nent = num; priv->nent = nent;for (i =0 ; i < nent; i++, sg++) {
drivers/usb/core/hub.c +1 -0
@@ -1162,6 +1162,7 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)* PORT_OVER_CURRENT is not. So check for any of them. */ if (udev || (portstatus &USB_PORT_STAT_CONNECTION ) || + (portchange &USB_PORT_STAT_C_CONNECTION ) || (portstatus &USB_PORT_STAT_OVERCURRENT ) || (portchange &USB_PORT_STAT_C_OVERCURRENT ))set_bit (port1, hub->change_bits);
drivers/usb/serial/ch341.c +5 -1
@@ -555,9 +555,13 @@ static int ch341_tiocmget(struct tty_struct *tty)static int ch341_reset_resume (struct usb_serial *serial) {struct usb_serial_port *port = serial->port[0 ]; -struct ch341_private *priv =usb_get_serial_port_data (port); +struct ch341_private *priv;int ret; + priv =usb_get_serial_port_data (port); +if (!priv) +return 0 ; +/* reconfigure ch341 serial port after bus-reset */ ch341_configure (serial->dev, priv);
drivers/usb/serial/io_edgeport.c +20 -13
@@ -572,6 +572,7 @@ static void edge_interrupt_callback(struct urb *urb)struct usb_serial_port *port;unsigned char *data = urb->transfer_buffer;int length = urb->actual_length; +unsigned long flags;int bytes_avail;int position;int txCredits;
@@ -603,7 +604,7 @@ static void edge_interrupt_callback(struct urb *urb)if (length >1 ) { bytes_avail = data[0 ] | (data[1 ] <<8 );if (bytes_avail) { -spin_lock (&edge_serial->es_lock); +spin_lock_irqsave (&edge_serial->es_lock, flags); edge_serial->rxBytesAvail += bytes_avail; dev_dbg(dev, "%s - bytes_avail=%d, rxBytesAvail=%d, read_in_progress=%d\n",
@@ -626,7 +627,8 @@ static void edge_interrupt_callback(struct urb *urb) edge_serial->read_in_progress = false; } } -spin_unlock (&edge_serial->es_lock); +spin_unlock_irqrestore (&edge_serial->es_lock, + flags); } }/* grab the txcredits for the ports if available */
@@ -638,10 +640,12 @@ static void edge_interrupt_callback(struct urb *urb)if (txCredits) { port = edge_serial->serial->port[portNumber]; edge_port =usb_get_serial_port_data (port); -if (edge_port->open) { -spin_lock (&edge_port->ep_lock); +if (edge_port && edge_port->open) { +spin_lock_irqsave (&edge_port->ep_lock, + flags); edge_port->txCredits += txCredits; -spin_unlock (&edge_port->ep_lock); +spin_unlock_irqrestore (&edge_port->ep_lock, + flags);dev_dbg (dev,"%s - txcredits for port%d = %d\n" , __func__, portNumber, edge_port->txCredits);
@@ -682,6 +686,7 @@ static void edge_bulk_in_callback(struct urb *urb)int retval;__u16 raw_data_length;int status = urb->status; +unsigned long flags;if (status) { dev_dbg(&urb->dev->dev, "%s - nonzero read bulk status received: %d\n",
@@ -701,7 +706,7 @@ static void edge_bulk_in_callback(struct urb *urb)usb_serial_debug_data (dev, __func__, raw_data_length, data); -spin_lock (&edge_serial->es_lock); +spin_lock_irqsave (&edge_serial->es_lock, flags);/* decrement our rxBytes available by the number that we just got */ edge_serial->rxBytesAvail -= raw_data_length;
@@ -725,7 +730,7 @@ static void edge_bulk_in_callback(struct urb *urb) edge_serial->read_in_progress = false; } -spin_unlock (&edge_serial->es_lock); +spin_unlock_irqrestore (&edge_serial->es_lock, flags); }
@@ -1662,7 +1667,8 @@ static void edge_break(struct tty_struct *tty, int break_state)static void process_rcvd_data (struct edgeport_serial *edge_serial,unsigned char *buffer,__u16 bufferLength) { -struct device *dev = &edge_serial->serial->dev->dev; +struct usb_serial *serial = edge_serial->serial; +struct device *dev = &serial->dev->dev;struct usb_serial_port *port;struct edgeport_port *edge_port;__u16 lastBufferLength;
@@ -1767,11 +1773,10 @@ static void process_rcvd_data(struct edgeport_serial *edge_serial,/* spit this data back into the tty driver if this port is open */ -if (rxLen) { - port = edge_serial->serial->port[ - edge_serial->rxPort]; +if (rxLen && edge_serial->rxPort < serial->num_ports) { + port = serial->port[edge_serial->rxPort]; edge_port =usb_get_serial_port_data (port); -if (edge_port->open) { +if (edge_port && edge_port->open) {dev_dbg (dev,"%s - Sending %d bytes to TTY for port %d\n" , __func__, rxLen, edge_serial->rxPort);
@@ -1779,8 +1784,8 @@ static void process_rcvd_data(struct edgeport_serial *edge_serial, rxLen); edge_port->port->icount.rx += rxLen; } - buffer += rxLen; } + buffer += rxLen;break ;case EXPECT_HDR3 :/* Expect 3rd byte of status header */
@@ -1815,6 +1820,8 @@ static void process_rcvd_status(struct edgeport_serial *edge_serial,__u8 code = edge_serial->rxStatusCode;/* switch the port pointer to the one being currently talked about */ +if (edge_serial->rxPort >= edge_serial->serial->num_ports) +return ; port = edge_serial->serial->port[edge_serial->rxPort]; edge_port =usb_get_serial_port_data (port);if (edge_port ==NULL ) {
drivers/usb/serial/keyspan.c +4 -0
@@ -567,6 +567,8 @@ static void usa49_glocont_callback(struct urb *urb)for (i =0 ; i < serial->num_ports; ++i) { port = serial->port[i]; p_priv =usb_get_serial_port_data (port); +if (!p_priv) +continue ;if (p_priv->resend_cont) {dev_dbg (&port->dev,"%s - sending setup\n" , __func__);
@@ -968,6 +970,8 @@ static void usa67_glocont_callback(struct urb *urb)for (i =0 ; i < serial->num_ports; ++i) { port = serial->port[i]; p_priv =usb_get_serial_port_data (port); +if (!p_priv) +continue ;if (p_priv->resend_cont) {dev_dbg (&port->dev,"%s - sending setup\n" , __func__);
drivers/usb/serial/opticon.c +1 -1
@@ -116,7 +116,7 @@ static int send_control_msg(struct usb_serial_port *port, u8 requesttype, retval =usb_control_msg (serial->dev,usb_sndctrlpipe (serial->dev,0 ), requesttype,USB_DIR_OUT |USB_TYPE_VENDOR |USB_RECIP_INTERFACE , -0 ,0 , buffer,1 ,0 ); +0 ,0 , buffer,1 ,USB_CTRL_SET_TIMEOUT );kfree (buffer);if (retval <0 )
drivers/usb/serial/quatech2.c +6 -0
@@ -872,7 +872,10 @@ static void qt2_update_msr(struct usb_serial_port *port, unsigned char *ch)u8 newMSR = (u8) *ch;unsigned long flags; +/* May be called from qt2_process_read_urb() for an unbound port. */ port_priv =usb_get_serial_port_data (port); +if (!port_priv) +return ;spin_lock_irqsave (&port_priv->lock, flags); port_priv->shadowMSR = newMSR;
@@ -900,7 +903,10 @@ static void qt2_update_lsr(struct usb_serial_port *port, unsigned char *ch)unsigned long flags;u8 newLSR = (u8) *ch; +/* May be called from qt2_process_read_urb() for an unbound port. */ port_priv =usb_get_serial_port_data (port); +if (!port_priv) +return ;if (newLSR &UART_LSR_BI ) newLSR &= (u8) (UART_LSR_OE |UART_LSR_BI );
drivers/usb/serial/usb-serial-simple.c +2 -0
@@ -89,6 +89,8 @@ DEVICE(moto_modem, MOTO_IDS);#define MOTOROLA_TETRA_IDS () \ { USB_DEVICE(0x0cad, 0x9011) },/* Motorola Solutions TETRA PEI */ \ { USB_DEVICE(0x0cad, 0x9012) }, /* MTP6550 */ \ + { USB_DEVICE(0x0cad, 0x9013) }, /* MTP3xxx */ \ + { USB_DEVICE(0x0cad, 0x9015) }, /* MTP85xx */ \ { USB_DEVICE(0x0cad, 0x9016) } /* TPG2200 */DEVICE (motorola_tetra,MOTOROLA_TETRA_IDS );
drivers/usb/serial/usb-serial.c +3 -0
@@ -1351,6 +1351,9 @@ static int usb_serial_register(struct usb_serial_driver *driver)return -EINVAL ; } +/* Prevent individual ports from being unbound. */ + driver->driver.suppress_bind_attrs = true; +usb_serial_operations_init (driver);/* Add this device to our list of devices */
firmware/Makefile +1 -1
@@ -156,7 +156,7 @@ quiet_cmd_fwbin = MK_FW $@ PROGBITS=$(if $(CONFIG_ARM),%,@)progbits; \ echo "/* Generated by firmware/Makefile */" > $@;\ echo " .section .rodata" >>$@;\ - echo " .p2align $${ASM_ALIGN}" >>$@;\ + echo " .p2align 4" >>$@;\ echo "_fw_$${FWSTR}_bin:" >>$@;\ echo " .incbin \"$(2)\"" >>$@;\ echo "_fw_end:" >>$@;\
fs/cifs/smb2file.c +1 -1
@@ -69,7 +69,7 @@ smb2_open_file(const unsigned int xid, struct cifs_open_parms *oparms, goto out; -if (oparms->tcon->use_resilient) { +if (oparms->tcon->use_resilient) { nr_ioctl_req.Timeout =0 ;/* use server default (120 seconds) */ nr_ioctl_req.Reserved =0 ; rc = SMB2_ioctl(xid, oparms->tcon, fid->persistent_fid,
fs/ext4/inode.c +15 -0
@@ -5472,10 +5472,25 @@ static int ext4_expand_extra_isize(struct inode *inode, {struct ext4_inode *raw_inode;struct ext4_xattr_ibody_header *header; +unsigned int inode_size =EXT4_INODE_SIZE (inode->i_sb); +struct ext4_inode_info *ei =EXT4_I (inode);if (EXT4_I (inode)->i_extra_isize >= new_extra_isize)return 0 ; +/* this was checked at iget time, but double check for good measure */ +if ((EXT4_GOOD_OLD_INODE_SIZE + ei->i_extra_isize > inode_size) || + (ei->i_extra_isize &3 )) { +EXT4_ERROR_INODE (inode,"bad extra_isize %u (inode size %u)" , + ei->i_extra_isize, +EXT4_INODE_SIZE (inode->i_sb)); +return -EFSCORRUPTED ; + } +if ((new_extra_isize < ei->i_extra_isize) || + (new_extra_isize <4 ) || + (new_extra_isize > inode_size -EXT4_GOOD_OLD_INODE_SIZE )) +return -EINVAL ;/* Should never happen */ + raw_inode =ext4_raw_inode (&iloc); header =IHDR (inode, raw_inode);
fs/ext4/super.c +37 -23
78 lines not on this page · raw message
fs/f2fs/data.c +1 -1
@@ -1267,7 +1267,7 @@ static int f2fs_write_data_page(struct page *page,loff_t i_size =i_size_read (inode);const pgoff_t end_index = ((unsigned long long ) i_size) >>PAGE_SHIFT ; -loff_t psize = (page->index +1 ) <<PAGE_SHIFT ; +loff_t psize = (loff_t)(page->index +1 ) <<PAGE_SHIFT ;unsigned offset =0 ;bool need_balance_fs = false;int err =0 ;
fs/f2fs/file.c +1 -1
@@ -980,7 +980,7 @@ static int __clone_blkaddrs(struct inode *src_inode, struct inode *dst_inode, } dn.ofs_in_node++; i++; - new_size = (dst + i) <<PAGE_SHIFT ; + new_size = (loff_t)(dst + i) <<PAGE_SHIFT ;if (dst_inode->i_size < new_size)f2fs_i_size_write (dst_inode, new_size); }while (--ilen && (do_replace[i] || blkaddr[i] ==NULL_ADDR ));
fs/ocfs2/journal.c +8 -0
@@ -1080,6 +1080,14 @@ int ocfs2_journal_load(struct ocfs2_journal *journal, int local, int replayed)ocfs2_clear_journal_error (osb->sb, journal->j_journal, osb->slot_num); +if (replayed) { +jbd2_journal_lock_updates (journal->j_journal); + status =jbd2_journal_flush (journal->j_journal); +jbd2_journal_unlock_updates (journal->j_journal); +if (status <0 ) +mlog_errno (status); + } + status =ocfs2_journal_toggle_dirty (osb,1 , replayed);if (status <0 ) {mlog_errno (status);
fs/reiserfs/xattr.c +6 -2
@@ -318,8 +318,12 @@ static int reiserfs_for_each_xattr(struct inode *inode, out_dir:dput (dir); out: -/* -ENODATA isn't an error */ -if (err == -ENODATA ) +/* +* -ENODATA: this object doesn't have any xattrs +* -EOPNOTSUPP: this file system doesn't have xattrs enabled on disk. +* Neither are errors +*/ +if (err == -ENODATA || err == -EOPNOTSUPP ) err =0 ;return err; }
include/dt-bindings/reset/amlogic,meson8b-reset.h +3 -3
@@ -95,9 +95,9 @@#define RESET_VD_RMEM 64#define RESET_AUDIN 65#define RESET_DBLK 66 -#define RESET_PIC_DC 66 -#define RESET_PSC 66 -#define RESET_NAND 66 +#define RESET_PIC_DC 67 +#define RESET_PSC 68 +#define RESET_NAND 69#define RESET_GE2D 70#define RESET_PARSER_REG 71#define RESET_PARSER_FETCH 72
include/linux/blkdev.h +4 -4
@@ -277,6 +277,7 @@ struct queue_limits {unsigned int max_sectors;unsigned int max_segment_size;unsigned int physical_block_size; +unsigned int logical_block_size;unsigned int alignment_offset;unsigned int io_min;unsigned int io_opt;
@@ -286,7 +287,6 @@ struct queue_limits {unsigned int discard_granularity;unsigned int discard_alignment; -unsigned short logical_block_size;unsigned short max_segments;unsigned short max_integrity_segments;
@@ -996,7 +996,7 @@ extern void blk_queue_max_discard_sectors(struct request_queue *q, unsigned int max_discard_sectors);extern void blk_queue_max_write_same_sectors (struct request_queue *q,unsigned int max_write_same_sectors); -extern void blk_queue_logical_block_size (struct request_queue *,unsigned short ); +extern void blk_queue_logical_block_size (struct request_queue *,unsigned int );extern void blk_queue_physical_block_size (struct request_queue *,unsigned int );extern void blk_queue_alignment_offset (struct request_queue *q,unsigned int alignment);
@@ -1221,7 +1221,7 @@ static inline unsigned int queue_max_segment_size(struct request_queue *q)return q->limits.max_segment_size; } -static inline unsigned short queue_logical_block_size (struct request_queue *q) +static inline unsigned queue_logical_block_size (struct request_queue *q) {int retval =512 ;
@@ -1231,7 +1231,7 @@ static inline unsigned short queue_logical_block_size(struct request_queue *q)return retval; } -static inline unsigned short bdev_logical_block_size (struct block_device *bdev) +static inline unsigned int bdev_logical_block_size (struct block_device *bdev) {return queue_logical_block_size (bdev_get_queue (bdev)); }
include/linux/poll.h +4 -0
@@ -14,7 +14,11 @@extern struct ctl_table epoll_table[];/* for sysctl */ /* ~832 bytes of stack space used max in sys_select/sys_poll before allocating additional memory. */ +#ifdef __clang__ +#define MAX_STACK_ALLOC 768 +#else #define MAX_STACK_ALLOC 832 +#endif #define FRONTEND_STACK_ALLOC 256#define SELECT_STACK_ALLOC FRONTEND_STACK_ALLOC#define POLL_STACK_ALLOC FRONTEND_STACK_ALLOC
include/linux/regulator/ab8500.h +0 -2
@@ -43,8 +43,6 @@ enum ab8505_regulator_id {AB8505_LDO_ANAMIC2 ,AB8505_LDO_AUX8 ,AB8505_LDO_ANA , -AB8505_SYSCLKREQ_2 , -AB8505_SYSCLKREQ_4 , AB8505_NUM_REGULATORS, };
include/net/cfg80211.h +11 -0
@@ -4181,6 +4181,17 @@ static inline const u8 *cfg80211_find_ie(u8 eid, const u8 *ies, int len)const u8 *cfg80211_find_vendor_ie (unsigned int oui,int oui_type,const u8 *ies,int len); +/** +* cfg80211_send_layer2_update - send layer 2 update frame +* +* @dev: network device +* @addr: STA MAC address +* +* Wireless drivers can use this function to update forwarding tables in bridge +* devices upon STA association. +*/ +void cfg80211_send_layer2_update (struct net_device *dev,const u8 *addr); +/** * DOC: Regulatory enforcement infrastructure *
mm/page-writeback.c +2 -2
@@ -200,11 +200,11 @@ static void wb_min_max_ratio(struct bdi_writeback *wb,if (this_bw < tot_bw) {if (min) { min *= this_bw; -do_div (min, tot_bw); + min =div64_ul (min, tot_bw); }if (max <100 ) { max *= this_bw; -do_div (max, tot_bw); + max =div64_ul (max, tot_bw); } }
net/batman-adv/distributed-arp-table.c +3 -1
@@ -242,6 +242,7 @@ static u32 batadv_hash_dat(const void *data, u32 size)u32 hash =0 ;const struct batadv_dat_entry *dat = data;const unsigned char *key; +__be16 vid;u32 i; key = (const unsigned char *)&dat->ip;
@@ -251,7 +252,8 @@ static u32 batadv_hash_dat(const void *data, u32 size) hash ^= (hash >>6 ); } - key = (const unsigned char *)&dat->vid; + vid =htons (dat->vid); + key = (__force const unsigned char *)&vid;for (i =0 ; i <sizeof (dat->vid); i++) { hash += key[i]; hash += (hash <<10 );
net/core/ethtool.c +9 -7
@@ -2332,9 +2332,10 @@ static int ethtool_set_tunable(struct net_device *dev, void __user *useraddr)return ret; } -static int ethtool_get_per_queue_coalesce (struct net_device *dev, -void __user *useraddr, -struct ethtool_per_queue_op *per_queue_opt) +static noinline_for_stack int +ethtool_get_per_queue_coalesce (struct net_device *dev, +void __user *useraddr, +struct ethtool_per_queue_op *per_queue_opt) {u32 bit;int ret;
@@ -2364,9 +2365,10 @@ static int ethtool_get_per_queue_coalesce(struct net_device *dev,return 0 ; } -static int ethtool_set_per_queue_coalesce (struct net_device *dev, -void __user *useraddr, -struct ethtool_per_queue_op *per_queue_opt) +static noinline_for_stack int +ethtool_set_per_queue_coalesce (struct net_device *dev, +void __user *useraddr, +struct ethtool_per_queue_op *per_queue_opt) {u32 bit;int i, ret =0 ;
@@ -2423,7 +2425,7 @@ static int ethtool_set_per_queue_coalesce(struct net_device *dev,return ret; } -static int ethtool_set_per_queue (struct net_device *dev, +static int noinline_for_stack ethtool_set_per_queue(struct net_device *dev,void __user *useraddr,u32 sub_cmd) {struct ethtool_per_queue_op per_queue_opt;
net/dccp/feat.c +6 -1
@@ -738,7 +738,12 @@ static int __feat_register_sp(struct list_head *fn, u8 feat, u8 is_local,if (dccp_feat_clone_sp_val (&fval, sp_val, sp_len))return -ENOMEM ; -return dccp_feat_push_change (fn, feat, is_local, mandatory, &fval); +if (dccp_feat_push_change (fn, feat, is_local, mandatory, &fval)) { +kfree (fval.sp.vec); +return -ENOMEM ; + } + +return 0 ; }/**
net/dsa/tag_qca.c +0 -3
@@ -40,9 +40,6 @@ static struct sk_buff *qca_tag_xmit(struct sk_buff *skb, struct net_device *dev)struct dsa_slave_priv *p =netdev_priv (dev);u16 *phdr, hdr; - dev->stats.tx_packets++; - dev->stats.tx_bytes += skb->len; -if (skb_cow_head (skb,0 ) <0 ) goto out_free;
net/hsr/hsr_device.c +2 -0
@@ -281,6 +281,8 @@ static void send_hsr_supervision_frame(struct hsr_port *master, skb->dev->dev_addr, skb->len) <= 0) goto out;skb_reset_mac_header (skb); +skb_reset_network_header (skb); +skb_reset_transport_header (skb);if (hsrVer >0 ) { hsr_tag = (typeof (hsr_tag ))skb_put (skb,sizeof (struct hsr_tag ));
net/ipv4/netfilter/arp_tables.c +10 -9
@@ -515,12 +515,13 @@ static inline int check_entry_size_and_hooks(struct arpt_entry *e,return 0 ; } -static inline void cleanup_entry (struct arpt_entry *e) +static void cleanup_entry (struct arpt_entry *e,struct net *net) {struct xt_tgdtor_param par;struct xt_entry_target *t; t =arpt_get_target (e); + par.net = net; par.target = t->u.kernel.target; par.targinfo = t->data; par.family =NFPROTO_ARP ;
@@ -612,7 +613,7 @@ static int translate_table(struct net *net, xt_entry_foreach(iter, entry0, newinfo->size) {if (i-- ==0 )break ; -cleanup_entry (iter); +cleanup_entry (iter, net); }return ret; }
@@ -939,7 +940,7 @@ static int __do_replace(struct net *net, const char *name,/* Decrease module usage counts and free resource */ loc_cpu_old_entry = oldinfo->entries; xt_entry_foreach(iter, loc_cpu_old_entry, oldinfo->size) -cleanup_entry (iter); +cleanup_entry (iter, net);xt_free_table_info (oldinfo); if (copy_to_user(counters_ptr, counters,
@@ -1003,7 +1004,7 @@ static int do_replace(struct net *net, const void __user *user, free_newinfo_untrans: xt_entry_foreach(iter, loc_cpu_entry, newinfo->size) -cleanup_entry (iter); +cleanup_entry (iter, net); free_newinfo:xt_free_table_info (newinfo);return ret;
@@ -1300,7 +1301,7 @@ static int compat_do_replace(struct net *net, void __user *user, free_newinfo_untrans: xt_entry_foreach(iter, loc_cpu_entry, newinfo->size) -cleanup_entry (iter); +cleanup_entry (iter, net); free_newinfo:xt_free_table_info (newinfo);return ret;
@@ -1527,7 +1528,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *lenreturn ret; } -static void __arpt_unregister_table (struct xt_table *table) +static void __arpt_unregister_table (struct net *net,struct xt_table *table) {struct xt_table_info *private;void *loc_cpu_entry;
@@ -1539,7 +1540,7 @@ static void __arpt_unregister_table(struct xt_table *table)/* Decrease module usage counts and free resources */ loc_cpu_entry = private->entries; xt_entry_foreach(iter, loc_cpu_entry, private->size) -cleanup_entry (iter); +cleanup_entry (iter, net);if (private->number > private->initial_entries)module_put (table_owner);xt_free_table_info (private);
@@ -1579,7 +1580,7 @@ int arpt_register_table(struct net *net, ret =nf_register_net_hooks (net, ops,hweight32 (table->valid_hooks));if (ret !=0 ) { -__arpt_unregister_table (new_table); +__arpt_unregister_table (net, new_table); *res =NULL ; }
@@ -1594,7 +1595,7 @@ void arpt_unregister_table(struct net *net, struct xt_table *table, const struct nf_hook_ops *ops) {nf_unregister_net_hooks (net, ops,hweight32 (table->valid_hooks)); -__arpt_unregister_table (table); +__arpt_unregister_table (net, table); }/* The built-in targets: standard (NULL) and error. */
net/ipv4/tcp_input.c +4 -3
@@ -923,9 +923,10 @@ static void tcp_update_reordering(struct sock *sk, const int metric,/* This must be called before lost_out is incremented */ static void tcp_verify_retransmit_hint (struct tcp_sock *tp,struct sk_buff *skb) { -if (!tp->retransmit_skb_hint || -before (TCP_SKB_CB (skb)->seq, -TCP_SKB_CB (tp->retransmit_skb_hint)->seq)) +if ((!tp->retransmit_skb_hint && tp->retrans_out >= tp->lost_out) || + (tp->retransmit_skb_hint && +before (TCP_SKB_CB (skb)->seq, +TCP_SKB_CB (tp->retransmit_skb_hint)->seq))) tp->retransmit_skb_hint = skb; if (!tp->lost_out ||
net/mac80211/cfg.c +3 -52
85 lines not on this page · raw message
net/mac80211/sta_info.c +4 -0
@@ -1896,6 +1896,10 @@ int sta_info_move_state(struct sta_info *sta,ieee80211_check_fast_xmit (sta);ieee80211_check_fast_rx (sta); } +if (sta->sdata->vif.type ==NL80211_IFTYPE_AP_VLAN || + sta->sdata->vif.type ==NL80211_IFTYPE_AP ) +cfg80211_send_layer2_update (sta->sdata->dev, + sta->sta.addr);break ;default :break ;
net/netfilter/ipset/ip_set_bitmap_gen.h +1 -1
@@ -66,9 +66,9 @@ mtype_destroy(struct ip_set *set)if (SET_WITH_TIMEOUT (set))del_timer_sync (&map->gc); -ip_set_free (map->members);if (set->dsize && set->extensions &IPSET_EXT_DESTROY )mtype_ext_cleanup (set); +ip_set_free (map->members);ip_set_free (map); set->data =NULL ;
net/socket.c +1 -0
@@ -3160,6 +3160,7 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,case SIOCSARP :case SIOCGARP :case SIOCDARP : +case SIOCOUTQNSD :case SIOCATMARK :return sock_do_ioctl (net, sock, cmd, arg); }
net/wireless/rdev-ops.h +4 -0
@@ -525,6 +525,10 @@ static inline int rdev_set_wiphy_params(struct cfg80211_registered_device *rdev, u32 changed) { int ret; + +if (!rdev->ops->set_wiphy_params) +return -EOPNOTSUPP ; +trace_rdev_set_wiphy_params (&rdev->wiphy, changed); ret = rdev->ops->set_wiphy_params (&rdev->wiphy, changed);trace_rdev_return_int (&rdev->wiphy, ret);
net/wireless/util.c +46 -1
56 lines not on this page · raw message
sound/core/seq/seq_timer.c +9 -5
@@ -479,15 +479,19 @@ void snd_seq_info_timer_read(struct snd_info_entry *entry, q =queueptr (idx);if (q ==NULL )continue ; -if ((tmr = q->timer) ==NULL || - (ti = tmr->timeri) ==NULL ) { -queuefree (q); -continue ; - } +mutex_lock (&q->timer_mutex); + tmr = q->timer; +if (!tmr) + goto unlock; + ti = tmr->timeri; +if (!ti) + goto unlock;snd_iprintf (buffer,"Timer for queue %i : %s\n" , q->queue, ti->timer->name); resolution =snd_timer_resolution (ti) * tmr->ticks;snd_iprintf (buffer," Period time : %lu.%09lu\n" , resolution /1000000000 , resolution %1000000000 );snd_iprintf (buffer," Skew : %u / %u\n" , tmr->skew, tmr->skew_base); +unlock: +mutex_unlock (&q->timer_mutex);queuefree (q); } }
tools/perf/builtin-report.c +4 -1
@@ -671,6 +671,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused)struct stat st;bool has_br_stack = false;int branch_mode =-1 ; +int last_key =0 ;bool branch_call_mode = false;char callchain_default_opt[] =CALLCHAIN_DEFAULT_OPT ;const char *const report_usage[] = {
@@ -956,7 +957,8 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused)else use_browser =0 ; -if (setup_sorting (session->evlist) <0 ) { +if ((last_key !=K_SWITCH_INPUT_DATA ) && + (setup_sorting (session->evlist) <0 )) {if (sort_order)parse_options_usage (report_usage, options,"s" ,1 );if (field_order)
@@ -1011,6 +1013,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) ret =__cmd_report (&report);if (ret ==K_SWITCH_INPUT_DATA ) {perf_session__delete (session); + last_key =K_SWITCH_INPUT_DATA ; goto repeat; }else ret =0 ;
tools/perf/util/hist.h +2 -2
@@ -312,10 +312,10 @@ static inline void perf_hpp__prepend_sort_field(struct perf_hpp_fmt *format) list_for_each_entry_safe(format, tmp, &(_list)->sorts, sort_list)#define hists__for_each_format (hists, format) \ - perf_hpp_list__for_each_format((hists)->hpp_list, fmt) + perf_hpp_list__for_each_format((hists)->hpp_list, format)#define hists__for_each_sort_list (hists, format) \ - perf_hpp_list__for_each_sort_list((hists)->hpp_list, fmt) + perf_hpp_list__for_each_sort_list((hists)->hpp_list, format)extern struct perf_hpp_fmt perf_hpp__format[];
tools/perf/util/probe-finder.c +10 -22
@@ -612,38 +612,26 @@ static int convert_to_trace_point(Dwarf_Die *sp_die, Dwfl_Module *mod,const char *function, struct probe_trace_point *tp) { - Dwarf_Addr eaddr, highaddr; + Dwarf_Addr eaddr;GElf_Sym sym;const char *symbol;/* Verify the address is correct */ -if (dwarf_entrypc (sp_die, &eaddr) !=0 ) { -pr_warning ("Failed to get entry address of %s\n" , -dwarf_diename (sp_die)); -return -ENOENT ; - } -if (dwarf_highpc (sp_die, &highaddr) !=0 ) { -pr_warning ("Failed to get end address of %s\n" , -dwarf_diename (sp_die)); -return -ENOENT ; - } -if (paddr > highaddr) { -pr_warning ("Offset specified is greater than size of %s\n" , +if (!dwarf_haspc (sp_die, paddr)) { +pr_warning ("Specified offset is out of %s\n" ,dwarf_diename (sp_die));return -EINVAL ; } - symbol =dwarf_diename (sp_die); +/* Try to get actual symbol name from symtab */ + symbol =dwfl_module_addrsym (mod, paddr, &sym,NULL );if (!symbol) { -/* Try to get the symbol name from symtab */ - symbol =dwfl_module_addrsym (mod, paddr, &sym,NULL ); -if (!symbol) { -pr_warning ("Failed to find symbol at 0x%lx\n" , - (unsigned long )paddr); -return -ENOENT ; - } - eaddr = sym.st_value; +pr_warning ("Failed to find symbol at 0x%lx\n" , + (unsigned long )paddr); +return -ENOENT ; } + eaddr = sym.st_value; + tp->offset = (unsigned long )(paddr - eaddr); tp->address = (unsigned long )paddr; tp->symbol =strdup (symbol);
tools/testing/selftests/rseq/settings new file +1 -0
@@ -0,0 +1 @@ +timeout=0