Linux 3.15.9
Greg KH
maintainerI'm announcing the release of the 3.15.9 kernel.
All users of the 3.15 kernel series must upgrade.
NOTE, there will only be 1 more 3.15.y kernel release after this one, please move to 3.16.y now, you have been warned.
The updated 3.15.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.15.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/x86/x86_64/mm.txt | 2 Makefile | 2 arch/arm/boot/dts/dra7-evm.dts | 1 arch/arm/boot/dts/hi3620.dtsi | 2 arch/arm/crypto/aesbs-glue.c | 10 - arch/arm/mach-omap2/gpmc-nand.c | 18 +- arch/arm/mm/idmap.c | 7 + arch/arm/mm/mmu.c | 6 arch/powerpc/perf/core-book3s.c | 6 arch/x86/Kconfig | 25 +++ arch/x86/include/asm/espfix.h | 16 ++ arch/x86/include/asm/irqflags.h | 2 arch/x86/include/asm/pgtable_64_types.h | 2 arch/x86/include/asm/setup.h | 2 arch/x86/kernel/Makefile | 1 arch/x86/kernel/entry_32.S | 12 + arch/x86/kernel/entry_64.S | 77 ++++++++++- arch/x86/kernel/espfix_64.c | 208 ++++++++++++++++++++++++++++++++ arch/x86/kernel/ldt.c | 10 - arch/x86/kernel/paravirt_patch_64.c | 2 arch/x86/kernel/smpboot.c | 7 + arch/x86/mm/dump_pagetables.c | 44 +++++- arch/x86/vdso/vdso32-setup.c | 8 - arch/x86/xen/setup.c | 9 - arch/xtensa/kernel/vectors.S | 158 ++++++++++++++++++++---- arch/xtensa/kernel/vmlinux.lds.S | 4 crypto/af_alg.c | 2 drivers/gpu/drm/i915/intel_display.c | 3 drivers/iio/accel/bma180.c | 8 - drivers/iio/industrialio-buffer.c | 2 drivers/md/dm-bufio.c | 2 drivers/md/dm-cache-target.c | 13 -- drivers/net/wireless/ath/ath9k/xmit.c | 9 + drivers/pnp/pnpacpi/core.c | 3 drivers/rapidio/devices/tsi721_dma.c | 8 + drivers/scsi/scsi_lib.c | 8 + drivers/staging/vt6655/bssdb.c | 2 drivers/staging/vt6655/device_main.c | 7 - fs/open.c | 5 include/dt-bindings/pinctrl/dra.h | 7 - include/linux/printk.h | 6 init/main.c | 4 kernel/printk/printk.c | 2 kernel/sched/core.c | 2 kernel/sched/deadline.c | 2 kernel/sched/rt.c | 2 kernel/time/clockevents.c | 10 - kernel/time/sched_clock.c | 4 lib/btree.c | 1 mm/memcontrol.c | 4 mm/page-writeback.c | 6 mm/page_alloc.c | 16 +- net/l2tp/l2tp_ppp.c | 4 net/mac80211/tx.c | 20 +-- net/wireless/trace.h | 3 55 files changed, 652 insertions(+), 154 deletions(-)
Alexandre Bounine (1):
rapidio/tsi721_dma: fix failure to obtain transaction descriptor
Andy Lutomirski (1):
x86_64/entry/xen: Do not invoke espfix64 on Xen
Anssi Hannula (1):
dm cache: fix race affecting dirty block count
Boris Ostrovsky (1):
x86/espfix/xen: Fix allocation of pages for paravirt page tables
Christoph Fritz (1):
ARM: OMAP2+: gpmc: fix gpmc_hwecc_bch_capable()
David Rientjes (1):
mm, thp: do not allow thp faults to avoid cpuset restrictions
David Vrabel (1):
x86/xen: no need to explicitly register an NMI callback
Eliad Peller (1):
cfg80211: fix mic_failure tracing
Eric Biggers (1):
vfs: fix check for fallocate on active swapfile
Felix Fietkau (1):
ath9k: fix aggregation session lockup
Greg Kroah-Hartman (1):
Linux 3.15.9
Greg Thelen (1):
dm bufio: fully initialize shrinker
H. Peter Anvin (6):
Revert "x86-64, modify_ldt: Make support for 16-bit segments a runtime option" x86-64, espfix: Don't leak bits 31:16 of %esp returning to 16-bit stack x86, espfix: Move espfix definitions into a separate header file x86, espfix: Fix broken header guard
x86, espfix: Make espfix64 a Kconfig option, fix UML
x86, espfix: Make it possible to disable 16-bit support
Haojian Zhuang (1):
ARM: dts: fix L2 address in Hi3620
James Bottomley (1):
scsi: handle flush errors properly
Jan Kara (1):
timer: Fix lock inversion between hrtimer_bases.lock and scheduler locks
Johannes Berg (1):
Revert "mac80211: move "bufferable MMPDU" check to fix AP mode scan"
John Stultz (1):
printk: rename printk_sched to printk_deferred
Konstantin Khlebnikov (1):
ARM: 8115/1: LPAE: reduce damage caused by idmap to virtual memory layout
Lars-Peter Clausen (1):
iio: buffer: Fix demux table creation
Malcolm Priestley (2):
staging: vt6655: Fix disassociated messages every 10 seconds
staging: vt6655: Fix Warning on boot handle_irq_event_percpu.
Max Filippov (1):
xtensa: add fixup for double exception raised in window overflow
Maxim Patlasov (1):
mm/page-writeback.c: fix divide by zero in bdi_dirty_limits()
Michael Ellerman (1):
powerpc/perf: Fix MMCR2 handling for EBB
Michal Hocko (1):
memcg: oom_notify use-after-free fix
Mikulas Patocka (1):
crypto: arm-aes - fix encryption of unaligned data
Milan Broz (1):
crypto: af_alg - properly label AF_ALG socket
Minfei Huang (1):
lib/btree.c: fix leak of whole btree nodes
Nishanth Menon (1):
pinctrl: dra: dt-bindings: Fix pull enable/disable
Peter Meerwald (2):
iio:bma180: Fix scale factors to report correct acceleration units iio:bma180: Missing check for frequency fractional part
Rafael J. Wysocki (1):
ACPI / PNP: Fix acpi_pnp_match()
Roger Quadros (1):
ARM: dts: dra7-evm: Make VDDA_1V8_PHY supply always on
Russell King (1):
ARM: fix alignment of keystone page table fixup
Sasha Levin (1):
net/l2tp: don't fall back on UDP [get|set]sockopt
Scot Doyle (1):
drm/i915: Ignore VBT backlight presence check on HP Chromebook 14
Stephen Boyd (1):
sched_clock: Avoid corrupting hrtimer tree during suspend
Greg KH
maintainerDocumentation/x86/x86_64/mm.txt +2 -0
@@ -12,6 +12,8 @@ ffffc90000000000 - ffffe8ffffffffff (=45 bits) vmalloc/ioremap space ffffe90000000000 - ffffe9ffffffffff (=40 bits) hole ffffea0000000000 - ffffeaffffffffff (=40 bits) virtual memory map (1TB) ... unused hole ... +ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks +... unused hole ... ffffffff80000000 - ffffffffa0000000 (=512 MB) kernel text mapping, from phys 0 ffffffffa0000000 - ffffffffff5fffff (=1525 MB) module mapping space ffffffffff600000 - ffffffffffdfffff (=8 MB) vsyscalls
Makefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 15 -SUBLEVEL = 8 +SUBLEVEL = 9 EXTRAVERSION = NAME = Double Funky Skunk
arch/arm/boot/dts/dra7-evm.dts +1 -0
@@ -182,6 +182,7 @@ regulator-name = "ldo3"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; + regulator-always-on; regulator-boot-on; };
arch/arm/boot/dts/hi3620.dtsi +1 -1
@@ -73,7 +73,7 @@ L2: l2-cache { compatible = "arm,pl310-cache"; - reg = <0xfc10000 0x100000>; + reg = <0x100000 0x100000>; interrupts = <0 15 4>; cache-unified; cache-level = <2>;
arch/arm/crypto/aesbs-glue.c +5 -5
@@ -137,7 +137,7 @@ static int aesbs_cbc_encrypt(struct blkcipher_desc *desc, dst +=AES_BLOCK_SIZE ; }while (--blocks); } - err =blkcipher_walk_done (desc, &walk,0 ); + err =blkcipher_walk_done (desc, &walk, walk.nbytes %AES_BLOCK_SIZE ); }return err; }
@@ -158,7 +158,7 @@ static int aesbs_cbc_decrypt(struct blkcipher_desc *desc,bsaes_cbc_encrypt (walk.src.virt.addr, walk.dst.virt.addr, walk.nbytes, &ctx->dec, walk.iv);kernel_neon_end (); - err =blkcipher_walk_done (desc, &walk,0 ); + err =blkcipher_walk_done (desc, &walk, walk.nbytes %AES_BLOCK_SIZE ); }while (walk.nbytes) {u32 blocks = walk.nbytes /AES_BLOCK_SIZE ;
@@ -182,7 +182,7 @@ static int aesbs_cbc_decrypt(struct blkcipher_desc *desc, dst +=AES_BLOCK_SIZE ; src +=AES_BLOCK_SIZE ; }while (--blocks); - err =blkcipher_walk_done (desc, &walk,0 ); + err =blkcipher_walk_done (desc, &walk, walk.nbytes %AES_BLOCK_SIZE ); }return err; }
@@ -268,7 +268,7 @@ static int aesbs_xts_encrypt(struct blkcipher_desc *desc,bsaes_xts_encrypt (walk.src.virt.addr, walk.dst.virt.addr, walk.nbytes, &ctx->enc, walk.iv);kernel_neon_end (); - err =blkcipher_walk_done (desc, &walk,0 ); + err =blkcipher_walk_done (desc, &walk, walk.nbytes %AES_BLOCK_SIZE ); }return err; }
@@ -292,7 +292,7 @@ static int aesbs_xts_decrypt(struct blkcipher_desc *desc,bsaes_xts_decrypt (walk.src.virt.addr, walk.dst.virt.addr, walk.nbytes, &ctx->dec, walk.iv);kernel_neon_end (); - err =blkcipher_walk_done (desc, &walk,0 ); + err =blkcipher_walk_done (desc, &walk, walk.nbytes %AES_BLOCK_SIZE ); }return err; }
arch/arm/mach-omap2/gpmc-nand.c +10 -8
@@ -50,6 +50,16 @@ static bool gpmc_hwecc_bch_capable(enum omap_ecc ecc_opt) soc_is_omap54xx() || soc_is_dra7xx())return 1 ; +if (ecc_opt ==OMAP_ECC_BCH4_CODE_HW_DETECTION_SW || + ecc_opt ==OMAP_ECC_BCH8_CODE_HW_DETECTION_SW ) { +if (cpu_is_omap24xx ()) +return 0 ; +else if (cpu_is_omap3630 () && (GET_OMAP_REVISION () ==0 )) +return 0 ; +else +return 1 ; + } +/* OMAP3xxx do not have ELM engine, so cannot support ECC schemes * which require H/W based ECC error detection */ if ((cpu_is_omap34xx() || cpu_is_omap3630()) &&
@@ -57,14 +67,6 @@ static bool gpmc_hwecc_bch_capable(enum omap_ecc ecc_opt) (ecc_opt == OMAP_ECC_BCH8_CODE_HW)))return 0 ; -/* -* For now, assume 4-bit mode is only supported on OMAP3630 ES1.x, x>=1 -* and AM33xx derivates. Other chips may be added if confirmed to work. -*/ -if ((ecc_opt ==OMAP_ECC_BCH4_CODE_HW_DETECTION_SW ) && - (!cpu_is_omap3630 () || (GET_OMAP_REVISION () ==0 ))) -return 0 ; -/* legacy platforms support only HAM1 (1-bit Hamming) ECC scheme */ if (ecc_opt ==OMAP_ECC_HAM1_CODE_HW )return 1 ;
arch/arm/mm/idmap.c +7 -0
@@ -25,6 +25,13 @@ static void idmap_add_pmd(pud_t *pud, unsigned long addr, unsigned long end,pr_warning ("Failed to allocate identity pmd.\n" );return ; } +/* +* Copy the original PMD to ensure that the PMD entries for +* the kernel image are preserved. +*/ +if (!pud_none (*pud)) +memcpy (pmd,pmd_offset (pud,0 ), +PTRS_PER_PMD *sizeof (pmd_t));pud_populate (&init_mm, pud, pmd); pmd +=pmd_index (addr); }else
arch/arm/mm/mmu.c +3 -3
@@ -1436,8 +1436,8 @@ void __init early_paging_init(const struct machine_desc *mdesc,return ;/* remap kernel code and data */ - map_start = init_mm.start_code; - map_end = init_mm.brk; + map_start = init_mm.start_code &PMD_MASK ; + map_end =ALIGN (init_mm.brk,PMD_SIZE );/* get a handle on things... */ pgd0 =pgd_offset_k (0 );
@@ -1472,7 +1472,7 @@ void __init early_paging_init(const struct machine_desc *mdesc, }/* remap pmds for kernel mapping */ - phys =__pa (map_start) &PMD_MASK ; + phys =__pa (map_start); do { *pmdk++ = __pmd(phys | pmdprot); phys += PMD_SIZE;
arch/powerpc/perf/core-book3s.c +3 -3
@@ -1307,6 +1307,9 @@ static void power_pmu_enable(struct pmu *pmu) out_enable:pmao_restore_workaround (ebb); +if (ppmu->flags &PPMU_ARCH_207S ) +mtspr (SPRN_MMCR2 ,0 ); + mmcr0 =ebb_switch_in (ebb, cpuhw->mmcr[0 ]);mb ();
@@ -1315,9 +1318,6 @@ static void power_pmu_enable(struct pmu *pmu)write_mmcr0 (cpuhw, mmcr0); -if (ppmu->flags &PPMU_ARCH_207S ) -mtspr (SPRN_MMCR2 ,0 ); -/* * Enable instruction sampling if necessary */
arch/x86/Kconfig +21 -4
@@ -910,10 +910,27 @@ config VM86 default y depends on X86_32 ---help--- - This option is required by programs like DOSEMU to run 16-bit legacy - code on X86 processors. It also may be needed by software like - XFree86 to initialize some video cards via BIOS. Disabling this - option saves about 6k. + This option is required by programs like DOSEMU to run + 16-bit real mode legacy code on x86 processors. It also may + be needed by software like XFree86 to initialize some video + cards via BIOS. Disabling this option saves about 6K. + +config X86_16BIT + bool "Enable support for 16-bit segments" if EXPERT + default y + ---help--- + This option is required by programs like Wine to run 16-bit + protected mode legacy code on x86 processors. Disabling + this option saves about 300 bytes on i386, or around 6K text + plus 16K runtime memory on x86-64, + +config X86_ESPFIX32 + def_bool y + depends on X86_16BIT && X86_32 + +config X86_ESPFIX64 + def_bool y + depends on X86_16BIT && X86_64 config TOSHIBA tristate "Toshiba Laptop support"
arch/x86/include/asm/espfix.h new file +16 -0
@@ -0,0 +1,16 @@ +#ifndef _ASM_X86_ESPFIX_H +#define _ASM_X86_ESPFIX_H + +#ifdef CONFIG_X86_64 + +#include <asm/percpu.h> + +DECLARE_PER_CPU_READ_MOSTLY(unsigned long, espfix_stack); +DECLARE_PER_CPU_READ_MOSTLY(unsigned long, espfix_waddr); + +extern void init_espfix_bsp (void ); +extern void init_espfix_ap (void ); + +#endif /* CONFIG_X86_64 */ + +#endif /* _ASM_X86_ESPFIX_H */
arch/x86/include/asm/irqflags.h +1 -1
@@ -129,7 +129,7 @@ static inline notrace unsigned long arch_local_irq_save(void)#define PARAVIRT_ADJUST_EXCEPTION_FRAME /* */ -#define INTERRUPT_RETURN iretq +#define INTERRUPT_RETURN jmp native_iret#define USERGS_SYSRET64 \ swapgs; \ sysretq;
arch/x86/include/asm/pgtable_64_types.h +2 -0
@@ -61,6 +61,8 @@ typedef struct { pteval_t pte; } pte_t;#define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)#define MODULES_END _AC(0xffffffffff000000, UL)#define MODULES_LEN (MODULES_END - MODULES_VADDR) +#define ESPFIX_PGD_ENTRY _AC(-2, UL) +#define ESPFIX_BASE_ADDR (ESPFIX_PGD_ENTRY << PGDIR_SHIFT)#define EARLY_DYNAMIC_PAGE_TABLES 64
arch/x86/include/asm/setup.h +2 -0
@@ -59,6 +59,8 @@ static inline void x86_ce4100_early_setup(void) { }#ifndef _SETUP +#include <asm/espfix.h> +/* * This is set up by the setup-routine at boot-time */
arch/x86/kernel/Makefile +1 -0
@@ -29,6 +29,7 @@ obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o obj-y += syscall_$(BITS).o vsyscall_gtod.o obj-$(CONFIG_X86_64) += vsyscall_64.o obj-$(CONFIG_X86_64) += vsyscall_emu_64.o +obj-$(CONFIG_X86_ESPFIX64) += espfix_64.o obj-$(CONFIG_SYSFS) += ksysfs.o obj-y += bootflag.o e820.o obj-y += pci-dma.o quirks.o topology.o kdebugfs.o
arch/x86/kernel/entry_32.S +12 -0
@@ -529,6 +529,7 @@ syscall_exit: restore_all: TRACE_IRQS_IRET restore_all_notrace: +#ifdef CONFIG_X86_ESPFIX32 movl PT_EFLAGS(%esp), %eax # mix EFLAGS, SS and CS # Warning: PT_OLDSS(%esp) contains the wrong/random values if we # are returning to the kernel.
@@ -539,6 +540,7 @@ restore_all_notrace: cmpl $((SEGMENT_LDT << 8) | USER_RPL), %eax CFI_REMEMBER_STATE je ldt_ss # returning to user-space with LDT SS +#endif restore_nocheck: RESTORE_REGS 4 # skip orig_eax/error_code irq_return:
@@ -551,6 +553,7 @@ ENTRY(iret_exc) .previous _ASM_EXTABLE(irq_return,iret_exc) +#ifdef CONFIG_X86_ESPFIX32 CFI_RESTORE_STATE ldt_ss: #ifdef CONFIG_PARAVIRT
@@ -594,6 +597,7 @@ ldt_ss: lss (%esp), %esp /* switch to espfix segment */ CFI_ADJUST_CFA_OFFSET -8 jmp restore_nocheck +#endif CFI_ENDPROC ENDPROC(system_call)
@@ -706,6 +710,7 @@ END(syscall_badsys) * the high word of the segment base from the GDT and swiches to the * normal stack and adjusts ESP with the matching offset. */ +#ifdef CONFIG_X86_ESPFIX32 /* fixup the stack */ mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */ mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
@@ -715,8 +720,10 @@ END(syscall_badsys) pushl_cfi %eax lss (%esp), %esp /* switch to the normal stack segment */ CFI_ADJUST_CFA_OFFSET -8 +#endif .endm .macro UNWIND_ESPFIX_STACK +#ifdef CONFIG_X86_ESPFIX32 movl %ss, %eax /* see if on espfix stack */ cmpw $__ESPFIX_SS, %ax
@@ -727,6 +734,7 @@ END(syscall_badsys) /* switch to normal stack */ FIXUP_ESPFIX_STACK 27: +#endif .endm /*
@@ -1357,11 +1365,13 @@ END(debug) ENTRY(nmi) RING0_INT_FRAME ASM_CLAC +#ifdef CONFIG_X86_ESPFIX32 pushl_cfi %eax movl %ss, %eax cmpw $__ESPFIX_SS, %ax popl_cfi %eax je nmi_espfix_stack +#endif cmpl $ia32_sysenter_target,(%esp) je nmi_stack_fixup pushl_cfi %eax
@@ -1401,6 +1411,7 @@ nmi_debug_stack_check: FIX_STACK 24, nmi_stack_correct, 1 jmp nmi_stack_correct +#ifdef CONFIG_X86_ESPFIX32 nmi_espfix_stack: /* We have a RING0_INT_FRAME here. *
@@ -1422,6 +1433,7 @@ nmi_espfix_stack: lss 12+4(%esp), %esp # back to espfix stack CFI_ADJUST_CFA_OFFSET -24 jmp irq_return +#endif CFI_ENDPROC END(nmi)
arch/x86/kernel/entry_64.S +71 -6
112 lines not on this page · raw message
arch/x86/kernel/espfix_64.c new file +208 -0
208 lines not on this page · raw message
arch/x86/kernel/ldt.c +1 -9
@@ -20,8 +20,6 @@#include <asm/mmu_context.h> #include <asm/syscalls.h> -int sysctl_ldt16 =0 ; -#ifdef CONFIG_SMP static void flush_ldt (void *current_mm) {
@@ -231,16 +229,10 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode) } } -/* -* On x86-64 we do not support 16-bit segments due to -* IRET leaking the high bits of the kernel stack address. -*/ -#ifdef CONFIG_X86_64 -if (!ldt_info.seg_32bit && !sysctl_ldt16) { +if (!IS_ENABLED (CONFIG_X86_16BIT ) && !ldt_info.seg_32bit) { error = -EINVAL ; goto out_unlock; } -#endif fill_ldt (&ldt, &ldt_info);if (oldmode)
arch/x86/kernel/paravirt_patch_64.c +0 -2
@@ -6,7 +6,6 @@ DEF_NATIVE(pv_irq_ops, irq_disable, "cli");DEF_NATIVE (pv_irq_ops, irq_enable,"sti" );DEF_NATIVE (pv_irq_ops, restore_fl,"pushq %rdi; popfq" );DEF_NATIVE (pv_irq_ops, save_fl,"pushfq; popq %rax" ); -DEF_NATIVE (pv_cpu_ops, iret,"iretq" );DEF_NATIVE (pv_mmu_ops, read_cr2,"movq %cr2, %rax" );DEF_NATIVE (pv_mmu_ops, read_cr3,"movq %cr3, %rax" );DEF_NATIVE (pv_mmu_ops, write_cr3,"movq %rdi, %cr3" );
@@ -50,7 +49,6 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,PATCH_SITE (pv_irq_ops, save_fl);PATCH_SITE (pv_irq_ops, irq_enable);PATCH_SITE (pv_irq_ops, irq_disable); -PATCH_SITE (pv_cpu_ops, iret);PATCH_SITE (pv_cpu_ops, irq_enable_sysexit);PATCH_SITE (pv_cpu_ops, usergs_sysret32);PATCH_SITE (pv_cpu_ops, usergs_sysret64);
arch/x86/kernel/smpboot.c +7 -0
@@ -244,6 +244,13 @@ static void notrace start_secondary(void *unused)check_tsc_sync_target ();/* +* Enable the espfix hack for this CPU +*/ +#ifdef CONFIG_X86_ESPFIX64 +init_espfix_ap (); +#endif + +/* * We need to hold vector_lock so there the set of online cpus * does not change while we are assigning vectors to cpus. Holding * this lock ensures we don't half assign or remove an irq from a cpu.
arch/x86/mm/dump_pagetables.c +33 -11
94 lines not on this page · raw message
arch/x86/vdso/vdso32-setup.c +0 -8
@@ -39,7 +39,6 @@#ifdef CONFIG_X86_64 #define vdso_enabled sysctl_vsyscall32#define arch_setup_additional_pages syscall32_setup_pages -extern int sysctl_ldt16;#endif /*
@@ -251,13 +250,6 @@ static struct ctl_table abi_table2[] = { .mode = 0644, .proc_handler = proc_dointvec }, - { - .procname = "ldt16", - .data = &sysctl_ldt16, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec - }, {} };
arch/x86/xen/setup.c +1 -8
@@ -574,13 +574,7 @@ void xen_enable_syscall(void) }#endif /* CONFIG_X86_64 */ } -void xen_enable_nmi (void ) -{ -#ifdef CONFIG_X86_64 -if (register_callback (CALLBACKTYPE_nmi, (char *)nmi)) -BUG (); -#endif -} +void __init xen_pvmmu_arch_setup (void ) {HYPERVISOR_vm_assist (VMASST_CMD_enable, VMASST_TYPE_4gb_segments);
@@ -595,7 +589,6 @@ void __init xen_pvmmu_arch_setup(void)xen_enable_sysenter ();xen_enable_syscall (); -xen_enable_nmi (); }/* This function is not called for HVM domains */
arch/xtensa/kernel/vectors.S +136 -22
191 lines not on this page · raw message
arch/xtensa/kernel/vmlinux.lds.S +2 -2
@@ -269,13 +269,13 @@ SECTIONS .UserExceptionVector.literal) SECTION_VECTOR (_DoubleExceptionVector_literal, .DoubleExceptionVector.literal, - DOUBLEEXC_VECTOR_VADDR - 16, + DOUBLEEXC_VECTOR_VADDR - 40, SIZEOF(.UserExceptionVector.text), .UserExceptionVector.text) SECTION_VECTOR (_DoubleExceptionVector_text, .DoubleExceptionVector.text, DOUBLEEXC_VECTOR_VADDR, - 32, + 40, .DoubleExceptionVector.literal) . = (LOADADDR( .DoubleExceptionVector.text ) + SIZEOF( .DoubleExceptionVector.text ) + 3) & ~ 3;
crypto/af_alg.c +2 -0
@@ -21,6 +21,7 @@#include <linux/module.h> #include <linux/net.h> #include <linux/rwsem.h> +#include <linux/security.h> struct alg_type_list {const struct af_alg_type *type;
@@ -243,6 +244,7 @@ int af_alg_accept(struct sock *sk, struct socket *newsock)sock_init_data (newsock, sk2);sock_graft (sk2, newsock); +security_sk_clone (sk, sk2); err = type->accept (ask->private, sk2);if (err) {
drivers/gpu/drm/i915/intel_display.c +3 -0
@@ -11251,6 +11251,9 @@ static struct intel_quirk intel_quirks[] = {/* Toshiba CB35 Chromebook (Celeron 2955U) */ { 0x0a06, 0x1179, 0x0a88, quirk_backlight_present }, + +/* HP Chromebook 14 (Celeron 2955U) */ + { 0x0a06, 0x103c, 0x21ed, quirk_backlight_present }, };static void intel_init_quirks (struct drm_device *dev)
drivers/iio/accel/bma180.c +5 -3
@@ -68,13 +68,13 @@/* Defaults values */ #define BMA180_DEF_PMODE 0#define BMA180_DEF_BW 20 -#define BMA180_DEF_SCALE 250 +#define BMA180_DEF_SCALE 2452/* Available values for sysfs */ #define BMA180_FLP_FREQ_AVAILABLE \ "10 20 40 75 150 300"#define BMA180_SCALE_AVAILABLE \ - "0.000130 0.000190 0.000250 0.000380 0.000500 0.000990 0.001980" + "0.001275 0.001863 0.002452 0.003727 0.004903 0.009709 0.019417"struct bma180_data {struct i2c_client *client;
@@ -94,7 +94,7 @@ enum bma180_axis { };static int bw_table[] = {10 ,20 ,40 ,75 ,150 ,300 };/* Hz */ -static int scale_table[] = {130 ,190 ,250 ,380 ,500 ,990 ,1980 }; +static int scale_table[] = {1275 ,1863 ,2452 ,3727 ,4903 ,9709 ,19417 };static int bma180_get_acc_reg (struct bma180_data *data,enum bma180_axis axis) {
@@ -376,6 +376,8 @@ static int bma180_write_raw(struct iio_dev *indio_dev,mutex_unlock (&data->mutex);return ret;case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY : +if (val2) +return -EINVAL ;mutex_lock (&data->mutex); ret =bma180_set_bw (data, val);mutex_unlock (&data->mutex);
drivers/iio/industrialio-buffer.c +1 -1
@@ -949,7 +949,7 @@ static int iio_buffer_update_demux(struct iio_dev *indio_dev,/* Now we have the two masks, work from least sig and build up sizes */ for_each_set_bit (out_ind, - indio_dev->active_scan_mask, + buffer->scan_mask, indio_dev->masklength) { in_ind = find_next_bit(indio_dev->active_scan_mask, indio_dev->masklength,
drivers/md/dm-bufio.c +1 -1
@@ -1541,7 +1541,7 @@ struct dm_bufio_client *dm_bufio_client_create(struct block_device *bdev, unsignBUG_ON (block_size <1 <<SECTOR_SHIFT || (block_size & (block_size -1 ))); - c =kmalloc (sizeof (*c),GFP_KERNEL ); + c =kzalloc (sizeof (*c),GFP_KERNEL );if (!c) { r = -ENOMEM ; goto bad_client;
drivers/md/dm-cache-target.c +6 -7
@@ -231,7 +231,7 @@ struct cache {/* * cache_size entries, dirty if set */ -dm_cblock_t nr_dirty; +atomic_t nr_dirty;unsigned long *dirty_bitset;/*
@@ -492,7 +492,7 @@ static bool is_dirty(struct cache *cache, dm_cblock_t b)static void set_dirty (struct cache *cache,dm_oblock_t oblock,dm_cblock_t cblock) {if (!test_and_set_bit (from_cblock (cblock), cache->dirty_bitset)) { - cache->nr_dirty =to_cblock (from_cblock (cache->nr_dirty) +1 ); +atomic_inc (&cache->nr_dirty);policy_set_dirty (cache->policy, oblock); } }
@@ -501,8 +501,7 @@ static void clear_dirty(struct cache *cache, dm_oblock_t oblock, dm_cblock_t cbl {if (test_and_clear_bit (from_cblock (cblock), cache->dirty_bitset)) {policy_clear_dirty (cache->policy, oblock); - cache->nr_dirty =to_cblock (from_cblock (cache->nr_dirty) -1 ); -if (!from_cblock (cache->nr_dirty)) +if (atomic_dec_return (&cache->nr_dirty) ==0 )dm_table_event (cache->ti->table); } }
@@ -2269,7 +2268,7 @@ static int cache_create(struct cache_args *ca, struct cache **result)atomic_set (&cache->quiescing_ack,0 ); r = -ENOMEM ; - cache->nr_dirty =0 ; +atomic_set (&cache->nr_dirty,0 ); cache->dirty_bitset =alloc_bitset (from_cblock (cache->cache_size));if (!cache->dirty_bitset) { *error ="could not allocate dirty bitset" ;
@@ -2808,7 +2807,7 @@ static void cache_status(struct dm_target *ti, status_type_t type, residency =policy_residency (cache->policy); - DMEMIT("%u %llu/%llu %u %llu/%llu %u %u %u %u %u %u %llu ", + DMEMIT("%u %llu/%llu %u %llu/%llu %u %u %u %u %u %u %lu ", (unsigned)(DM_CACHE_METADATA_BLOCK_SIZE >> SECTOR_SHIFT), (unsigned long long)(nr_blocks_metadata - nr_free_blocks_metadata), (unsigned long long)nr_blocks_metadata,
@@ -2821,7 +2820,7 @@ static void cache_status(struct dm_target *ti, status_type_t type, (unsigned )atomic_read (&cache->stats.write_miss), (unsigned )atomic_read (&cache->stats.demotion), (unsigned )atomic_read (&cache->stats.promotion), - (unsigned long long) from_cblock(cache->nr_dirty)); + (unsigned long) atomic_read(&cache->nr_dirty));if (writethrough_mode (&cache->features))DMEMIT ("1 writethrough " );
drivers/net/wireless/ath/ath9k/xmit.c +9 -0
@@ -887,6 +887,15 @@ ath_tx_get_tid_subframe(struct ath_softc *sc, struct ath_txq *txq, tx_info =IEEE80211_SKB_CB (skb); tx_info->flags &= ~IEEE80211_TX_CTL_CLEAR_PS_FILT ; + +/* +* No aggregation session is running, but there may be frames +* from a previous session or a failed attempt in the queue. +* Send them out as normal data frames +*/ +if (!tid->active) + tx_info->flags &= ~IEEE80211_TX_CTL_AMPDU ; +if (!(tx_info->flags &IEEE80211_TX_CTL_AMPDU )) { bf->bf_state.bf_type =0 ;return bf;
drivers/pnp/pnpacpi/core.c +1 -2
@@ -339,8 +339,7 @@ static int __init acpi_pnp_match(struct device *dev, void *_pnp)struct pnp_dev *pnp = _pnp;/* true means it matched */ -return !acpi->physical_node_count - &&compare_pnp_id (pnp->id,acpi_device_hid (acpi)); +return pnp->data == acpi; }static struct acpi_device *__init acpi_pnp_find_companion (struct device *dev)
drivers/rapidio/devices/tsi721_dma.c +7 -1
@@ -287,6 +287,12 @@ struct tsi721_tx_desc *tsi721_desc_get(struct tsi721_bdma_chan *bdma_chan) "desc %p not ACKed\n", tx_desc); } +if (ret ==NULL ) { +dev_dbg (bdma_chan->dchan.device->dev, +"%s: unable to obtain tx descriptor\n" , __func__); + goto err_out; + } + i = bdma_chan->wr_count_next % bdma_chan->bd_num;if (i == bdma_chan->bd_num -1 ) { i =0 ;
@@ -297,7 +303,7 @@ struct tsi721_tx_desc *tsi721_desc_get(struct tsi721_bdma_chan *bdma_chan) tx_desc->txd.phys = bdma_chan->bd_phys + i *sizeof (struct tsi721_dma_desc ); tx_desc->hw_desc = &((struct tsi721_dma_desc *)bdma_chan->bd_base)[i]; - +err_out:spin_unlock_bh (&bdma_chan->lock);return ret;
drivers/scsi/scsi_lib.c +8 -0
@@ -806,6 +806,14 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)scsi_next_command (cmd);return ; } + }else if (blk_rq_bytes (req) ==0 && result && !sense_deferred) { +/* +* Certain non BLOCK_PC requests are commands that don't +* actually transfer anything (FLUSH), so cannot use +* good_bytes != blk_rq_bytes(req) as the signal for an error. +* This sets the error explicitly for the problem case. +*/ + error =__scsi_error_from_host_byte (cmd, result); }/* no bidi support for !REQ_TYPE_BLOCK_PC yet */
drivers/staging/vt6655/bssdb.c +1 -1
@@ -983,7 +983,7 @@ start: pDevice->byERPFlag &= ~(WLAN_SET_ERP_USE_PROTECTION (1 )); } - { +if (pDevice->eCommandState ==WLAN_ASSOCIATE_WAIT ) { pDevice->byReAssocCount++;/* 10 sec timeout */ if ((pDevice->byReAssocCount >10 ) && (!pDevice->bLinkPass)) {
drivers/staging/vt6655/device_main.c +5 -2
@@ -2430,6 +2430,7 @@ static irqreturn_t device_intr(int irq, void *dev_instance) {int handled =0 ;unsigned char byData =0 ;int ii =0 ; +unsigned long flags;// unsigned char byRSSI; MACvReadISR (pDevice->PortOffset, &pDevice->dwIsr);
@@ -2455,7 +2456,8 @@ static irqreturn_t device_intr(int irq, void *dev_instance) { handled =1 ;MACvIntDisable (pDevice->PortOffset); -spin_lock_irq (&pDevice->lock); + +spin_lock_irqsave (&pDevice->lock, flags);//Make sure current page is 0 VNSvInPortB (pDevice->PortOffset +MAC_REG_PAGE1SEL , &byOrgPageSel);
@@ -2696,7 +2698,8 @@ static irqreturn_t device_intr(int irq, void *dev_instance) {MACvSelectPage1 (pDevice->PortOffset); } -spin_unlock_irq (&pDevice->lock); +spin_unlock_irqrestore (&pDevice->lock, flags); +MACvIntEnable (pDevice->PortOffset,IMR_MASK_VALUE );return IRQ_RETVAL (handled);
fs/open.c +2 -3
@@ -263,11 +263,10 @@ int do_fallocate(struct file *file, int mode, loff_t offset, loff_t len)return -EPERM ;/* -* We can not allow to do any fallocate operation on an active -* swapfile +* We cannot allow any fallocate operation on an active swapfile */ if (IS_SWAPFILE (inode)) - ret = -ETXTBSY ; +return -ETXTBSY ;/* * Revalidate the write permissions, in case security policy has
include/dt-bindings/pinctrl/dra.h +4 -3
@@ -30,7 +30,8 @@#define MUX_MODE14 0xe#define MUX_MODE15 0xf -#define PULL_ENA (1 << 16) +#define PULL_ENA (0 << 16) +#define PULL_DIS (1 << 16)#define PULL_UP (1 << 17)#define INPUT_EN (1 << 18)#define SLEWCONTROL (1 << 19)
@@ -38,10 +39,10 @@#define WAKEUP_EVENT (1 << 25)/* Active pin states */ -#define PIN_OUTPUT 0 +#define PIN_OUTPUT (0 | PULL_DIS)#define PIN_OUTPUT_PULLUP (PIN_OUTPUT | PULL_ENA | PULL_UP)#define PIN_OUTPUT_PULLDOWN (PIN_OUTPUT | PULL_ENA) -#define PIN_INPUT INPUT_EN +#define PIN_INPUT (INPUT_EN | PULL_DIS)#define PIN_INPUT_SLEW (INPUT_EN | SLEWCONTROL)#define PIN_INPUT_PULLUP (PULL_ENA | INPUT_EN | PULL_UP)#define PIN_INPUT_PULLDOWN (PULL_ENA | INPUT_EN)
include/linux/printk.h +3 -3
@@ -128,9 +128,9 @@ asmlinkage __printf(1, 2) __coldint printk (const char *fmt, ...);/* -* Special printk facility for scheduler use only, _DO_NOT_USE_ ! +* Special printk facility for scheduler/timekeeping use only, _DO_NOT_USE_ ! */ -__printf(1, 2) __cold int printk_sched(const char *fmt, ...); +__printf(1, 2) __cold int printk_deferred(const char *fmt, ...);/* * Please don't use printk_ratelimit(), because it shares ratelimiting state
@@ -165,7 +165,7 @@ int printk(const char *s, ...)return 0 ; } static inline __printf(1, 2) __cold -int printk_sched(const char *s, ...) +int printk_deferred(const char *s, ...) {return 0 ; }
init/main.c +4 -0
@@ -617,6 +617,10 @@ asmlinkage __visible void __init start_kernel(void)if (efi_enabled (EFI_RUNTIME_SERVICES ))efi_enter_virtual_mode ();#endif +#ifdef CONFIG_X86_ESPFIX64 +/* Should be run before the first non-init thread is created */ +init_espfix_bsp (); +#endif thread_info_cache_init ();cred_init ();fork_init (totalram_pages);
kernel/printk/printk.c +1 -1
@@ -2474,7 +2474,7 @@ void wake_up_klogd(void)preempt_enable (); } -int printk_sched (const char *fmt, ...) +int printk_deferred (const char *fmt, ...) {unsigned long flags;va_list args;
kernel/sched/core.c +1 -1
@@ -1320,7 +1320,7 @@ out:* leave kernel. */ if (p->mm &&printk_ratelimit ()) { -printk_sched ("process %d (%s) no longer affine to cpu%d\n" , +printk_deferred ("process %d (%s) no longer affine to cpu%d\n" ,task_pid_nr (p), p->comm, cpu); } }
kernel/sched/deadline.c +1 -1
@@ -352,7 +352,7 @@ static void replenish_dl_entity(struct sched_dl_entity *dl_se,if (!lag_once) { lag_once = true; -printk_sched ("sched: DL replenish lagged to much\n" ); +printk_deferred ("sched: DL replenish lagged to much\n" ); } dl_se->deadline =rq_clock (rq) + pi_se->dl_deadline; dl_se->runtime = pi_se->dl_runtime;
kernel/sched/rt.c +1 -1
@@ -857,7 +857,7 @@ static int sched_rt_runtime_exceeded(struct rt_rq *rt_rq)if (!once) { once = true; -printk_sched ("sched: RT throttling activated\n" ); +printk_deferred ("sched: RT throttling activated\n" ); } }else {/*
kernel/time/clockevents.c +6 -4
@@ -146,7 +146,8 @@ static int clockevents_increase_min_delta(struct clock_event_device *dev) {/* Nothing to do if we already reached the limit */ if (dev->min_delta_ns >=MIN_DELTA_LIMIT ) { -printk (KERN_WARNING "CE: Reprogramming failure. Giving up\n" ); +printk_deferred (KERN_WARNING +"CE: Reprogramming failure. Giving up\n" ); dev->next_event.tv64 =KTIME_MAX ;return -ETIME ; }
@@ -159,9 +160,10 @@ static int clockevents_increase_min_delta(struct clock_event_device *dev)if (dev->min_delta_ns >MIN_DELTA_LIMIT ) dev->min_delta_ns =MIN_DELTA_LIMIT ; -printk (KERN_WARNING "CE: %s increased min_delta_ns to %llu nsec\n" , - dev->name ? dev->name :"?" , - (unsigned long long ) dev->min_delta_ns); +printk_deferred (KERN_WARNING +"CE: %s increased min_delta_ns to %llu nsec\n" , + dev->name ? dev->name :"?" , + (unsigned long long ) dev->min_delta_ns);return 0 ; }
kernel/time/sched_clock.c +3 -1
@@ -204,7 +204,8 @@ void __init sched_clock_postinit(void)static int sched_clock_suspend (void ) { -sched_clock_poll (&sched_clock_timer); +update_sched_clock (); +hrtimer_cancel (&sched_clock_timer); cd.suspended = true;return 0 ; }
@@ -212,6 +213,7 @@ static int sched_clock_suspend(void)static void sched_clock_resume (void ) { cd.epoch_cyc =read_sched_clock (); +hrtimer_start (&sched_clock_timer, cd.wrap_kt,HRTIMER_MODE_REL ); cd.suspended = false; }
lib/btree.c +1 -0
@@ -198,6 +198,7 @@ EXPORT_SYMBOL_GPL(btree_init);void btree_destroy (struct btree_head *head) { +mempool_free (head->node, head->mempool);mempool_destroy (head->mempool); head->mempool =NULL ; }
mm/memcontrol.c +4 -0
@@ -5544,8 +5544,12 @@ static int mem_cgroup_oom_notify_cb(struct mem_cgroup *memcg) {struct mem_cgroup_eventfd_list *ev; +spin_lock (&memcg_oom_lock); +list_for_each_entry (ev, &memcg->oom_notify, list)eventfd_signal (ev->eventfd,1 ); + +spin_unlock (&memcg_oom_lock);return 0 ; }
mm/page-writeback.c +3 -3
@@ -1324,9 +1324,9 @@ static inline void bdi_dirty_limits(struct backing_dev_info *bdi, *bdi_thresh =bdi_dirty_limit (bdi, dirty_thresh);if (bdi_bg_thresh) - *bdi_bg_thresh =div_u64 ((u64)*bdi_thresh * - background_thresh, - dirty_thresh); + *bdi_bg_thresh = dirty_thresh ?div_u64 ((u64)*bdi_thresh * + background_thresh, + dirty_thresh) :0 ;/* * In order to avoid the stacked BDI deadlock we need
mm/page_alloc.c +8 -8
@@ -2435,7 +2435,7 @@ static inline int gfp_to_alloc_flags(gfp_t gfp_mask) {int alloc_flags =ALLOC_WMARK_MIN |ALLOC_CPUSET ; -const gfp_t wait = gfp_mask & __GFP_WAIT; +const bool atomic = !(gfp_mask & (__GFP_WAIT | __GFP_NO_KSWAPD));/* __GFP_HIGH is assumed to be the same as ALLOC_HIGH to save a branch. */ BUILD_BUG_ON (__GFP_HIGH != (__force gfp_t )ALLOC_HIGH );
@@ -2444,20 +2444,20 @@ gfp_to_alloc_flags(gfp_t gfp_mask)* The caller may dip into page reserves a bit more if the caller * cannot run direct reclaim, or if the caller has realtime scheduling * policy or is asking for __GFP_HIGH memory. GFP_ATOMIC requests will -* set both ALLOC_HARDER (!wait) and ALLOC_HIGH (__GFP_HIGH). +* set both ALLOC_HARDER (atomic == true) and ALLOC_HIGH (__GFP_HIGH). */ alloc_flags |= (__force int ) (gfp_mask & __GFP_HIGH); -if (!wait) { +if (atomic) {/* -* Not worth trying to allocate harder for -* __GFP_NOMEMALLOC even if it can't schedule. +* Not worth trying to allocate harder for __GFP_NOMEMALLOC even +* if it can't schedule. */ -if (!(gfp_mask & __GFP_NOMEMALLOC)) +if (!(gfp_mask & __GFP_NOMEMALLOC)) alloc_flags |=ALLOC_HARDER ;/* -* Ignore cpuset if GFP_ATOMIC (!wait) rather than fail alloc. -* See also cpuset_zone_allowed() comment in kernel/cpuset.c. +* Ignore cpuset mems for GFP_ATOMIC rather than fail, see the +* comment for __cpuset_node_allowed_softwall(). */ alloc_flags &= ~ALLOC_CPUSET ; }else if (unlikely (rt_task (current)) && !in_interrupt ())
net/l2tp/l2tp_ppp.c +2 -2
@@ -1365,7 +1365,7 @@ static int pppol2tp_setsockopt(struct socket *sock, int level, int optname,int err;if (level !=SOL_PPPOL2TP ) -return udp_prot.setsockopt (sk, level, optname, optval, optlen); +return -EINVAL ;if (optlen <sizeof (int ))return -EINVAL ;
@@ -1491,7 +1491,7 @@ static int pppol2tp_getsockopt(struct socket *sock, int level, int optname,struct pppol2tp_session *ps;if (level !=SOL_PPPOL2TP ) -return udp_prot.getsockopt (sk, level, optname, optval, optlen); +return -EINVAL ;if (get_user (len, optlen))return -EFAULT ;
net/mac80211/tx.c +10 -10
@@ -414,6 +414,9 @@ ieee80211_tx_h_multicast_ps_buf(struct ieee80211_tx_data *tx)if (ieee80211_has_order (hdr->frame_control))return TX_CONTINUE ; +if (ieee80211_is_probe_req (hdr->frame_control)) +return TX_CONTINUE ; +if (tx->local->hw.flags &IEEE80211_HW_QUEUE_CONTROL ) info->hw_queue = tx->sdata->vif.cab_queue;
@@ -463,6 +466,7 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx) {struct sta_info *sta = tx->sta;struct ieee80211_tx_info *info =IEEE80211_SKB_CB (tx->skb); +struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data;struct ieee80211_local *local = tx->local;if (unlikely (!sta))
@@ -473,6 +477,12 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx) !(info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER))) {int ac =skb_get_queue_mapping (tx->skb); +if (ieee80211_is_mgmt (hdr->frame_control) && + !ieee80211_is_bufferable_mmpdu (hdr->frame_control)) { + info->flags |=IEEE80211_TX_CTL_NO_PS_BUFFER ; +return TX_CONTINUE ; + } +ps_dbg (sta->sdata,"STA %pM aid %d: PS buffer for AC %d\n" , sta->sta.addr, sta->sta.aid, ac);if (tx->local->total_ps_buffered >=TOTAL_MAX_TX_BUFFER )
@@ -531,19 +541,9 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx) static ieee80211_tx_result debug_noinlineieee80211_tx_h_ps_buf (struct ieee80211_tx_data *tx) { -struct ieee80211_tx_info *info =IEEE80211_SKB_CB (tx->skb); -struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data; -if (unlikely (tx->flags &IEEE80211_TX_PS_BUFFERED ))return TX_CONTINUE ; -if (ieee80211_is_mgmt (hdr->frame_control) && - !ieee80211_is_bufferable_mmpdu (hdr->frame_control)) { -if (tx->flags &IEEE80211_TX_UNICAST ) - info->flags |=IEEE80211_TX_CTL_NO_PS_BUFFER ; -return TX_CONTINUE ; - } -if (tx->flags &IEEE80211_TX_UNICAST )return ieee80211_tx_h_unicast_ps_buf (tx);else
net/wireless/trace.h +2 -1
@@ -2072,7 +2072,8 @@ TRACE_EVENT(cfg80211_michael_mic_failure,MAC_ASSIGN (addr, addr); __entry->key_type = key_type; __entry->key_id = key_id; -memcpy (__entry->tsc, tsc,6 ); +if (tsc) +memcpy (__entry->tsc, tsc,6 ); ), TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT ", key type: %d, key id: %d, tsc: %pm", NETDEV_PR_ARG, MAC_PR_ARG(addr), __entry->key_type,