Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull core fixes from Ingo Molnar:
"A fix to WARN_ON_ONCE() done by modules, plus a MAINTAINERS update"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
debug: Fix WARN_ON_ONCE() for modules
MAINTAINERS: Update the PTRACE entry

+23 -19
+5 -1
MAINTAINERS
··· 10684 10684 F: include/linux/ptp_cl* 10685 10685 10686 10686 PTRACE SUPPORT 10687 - M: Roland McGrath <roland@hack.frob.com> 10688 10687 M: Oleg Nesterov <oleg@redhat.com> 10689 10688 S: Maintained 10690 10689 F: include/asm-generic/syscall.h ··· 10691 10692 F: include/linux/regset.h 10692 10693 F: include/linux/tracehook.h 10693 10694 F: include/uapi/linux/ptrace.h 10695 + F: include/uapi/linux/ptrace.h 10696 + F: include/asm-generic/ptrace.h 10694 10697 F: kernel/ptrace.c 10698 + F: arch/*/ptrace*.c 10699 + F: arch/*/*/ptrace*.c 10700 + F: arch/*/include/asm/ptrace*.h 10695 10701 10696 10702 PULSE8-CEC DRIVER 10697 10703 M: Hans Verkuil <hverkuil@xs4all.nl>
+1 -1
arch/arm/include/asm/bug.h
··· 37 37 ".pushsection .rodata.str, \"aMS\", %progbits, 1\n" \ 38 38 "2:\t.asciz " #__file "\n" \ 39 39 ".popsection\n" \ 40 - ".pushsection __bug_table,\"a\"\n" \ 40 + ".pushsection __bug_table,\"aw\"\n" \ 41 41 ".align 2\n" \ 42 42 "3:\t.word 1b, 2b\n" \ 43 43 "\t.hword " #__line ", 0\n" \
+1 -1
arch/arm64/include/asm/bug.h
··· 36 36 #ifdef CONFIG_GENERIC_BUG 37 37 38 38 #define __BUG_ENTRY(flags) \ 39 - ".pushsection __bug_table,\"a\"\n\t" \ 39 + ".pushsection __bug_table,\"aw\"\n\t" \ 40 40 ".align 2\n\t" \ 41 41 "0: .long 1f - 0b\n\t" \ 42 42 _BUGVERBOSE_LOCATION(__FILE__, __LINE__) \
+2 -2
arch/blackfin/include/asm/bug.h
··· 21 21 #define _BUG_OR_WARN(flags) \ 22 22 asm volatile( \ 23 23 "1: .hword %0\n" \ 24 - " .section __bug_table,\"a\",@progbits\n" \ 24 + " .section __bug_table,\"aw\",@progbits\n" \ 25 25 "2: .long 1b\n" \ 26 26 " .long %1\n" \ 27 27 " .short %2\n" \ ··· 38 38 #define _BUG_OR_WARN(flags) \ 39 39 asm volatile( \ 40 40 "1: .hword %0\n" \ 41 - " .section __bug_table,\"a\",@progbits\n" \ 41 + " .section __bug_table,\"aw\",@progbits\n" \ 42 42 "2: .long 1b\n" \ 43 43 " .short %1\n" \ 44 44 " .org 2b + %2\n" \
+1 -1
arch/mn10300/include/asm/bug.h
··· 21 21 asm volatile( \ 22 22 " syscall 15 \n" \ 23 23 "0: \n" \ 24 - " .section __bug_table,\"a\" \n" \ 24 + " .section __bug_table,\"aw\" \n" \ 25 25 " .long 0b,%0,%1 \n" \ 26 26 " .previous \n" \ 27 27 : \
+3 -3
arch/parisc/include/asm/bug.h
··· 27 27 do { \ 28 28 asm volatile("\n" \ 29 29 "1:\t" PARISC_BUG_BREAK_ASM "\n" \ 30 - "\t.pushsection __bug_table,\"a\"\n" \ 30 + "\t.pushsection __bug_table,\"aw\"\n" \ 31 31 "2:\t" ASM_WORD_INSN "1b, %c0\n" \ 32 32 "\t.short %c1, %c2\n" \ 33 33 "\t.org 2b+%c3\n" \ ··· 50 50 do { \ 51 51 asm volatile("\n" \ 52 52 "1:\t" PARISC_BUG_BREAK_ASM "\n" \ 53 - "\t.pushsection __bug_table,\"a\"\n" \ 53 + "\t.pushsection __bug_table,\"aw\"\n" \ 54 54 "2:\t" ASM_WORD_INSN "1b, %c0\n" \ 55 55 "\t.short %c1, %c2\n" \ 56 56 "\t.org 2b+%c3\n" \ ··· 64 64 do { \ 65 65 asm volatile("\n" \ 66 66 "1:\t" PARISC_BUG_BREAK_ASM "\n" \ 67 - "\t.pushsection __bug_table,\"a\"\n" \ 67 + "\t.pushsection __bug_table,\"aw\"\n" \ 68 68 "2:\t" ASM_WORD_INSN "1b\n" \ 69 69 "\t.short %c0\n" \ 70 70 "\t.org 2b+%c1\n" \
+4 -4
arch/powerpc/include/asm/bug.h
··· 18 18 #include <asm/asm-offsets.h> 19 19 #ifdef CONFIG_DEBUG_BUGVERBOSE 20 20 .macro EMIT_BUG_ENTRY addr,file,line,flags 21 - .section __bug_table,"a" 21 + .section __bug_table,"aw" 22 22 5001: PPC_LONG \addr, 5002f 23 23 .short \line, \flags 24 24 .org 5001b+BUG_ENTRY_SIZE ··· 29 29 .endm 30 30 #else 31 31 .macro EMIT_BUG_ENTRY addr,file,line,flags 32 - .section __bug_table,"a" 32 + .section __bug_table,"aw" 33 33 5001: PPC_LONG \addr 34 34 .short \flags 35 35 .org 5001b+BUG_ENTRY_SIZE ··· 42 42 sizeof(struct bug_entry), respectively */ 43 43 #ifdef CONFIG_DEBUG_BUGVERBOSE 44 44 #define _EMIT_BUG_ENTRY \ 45 - ".section __bug_table,\"a\"\n" \ 45 + ".section __bug_table,\"aw\"\n" \ 46 46 "2:\t" PPC_LONG "1b, %0\n" \ 47 47 "\t.short %1, %2\n" \ 48 48 ".org 2b+%3\n" \ 49 49 ".previous\n" 50 50 #else 51 51 #define _EMIT_BUG_ENTRY \ 52 - ".section __bug_table,\"a\"\n" \ 52 + ".section __bug_table,\"aw\"\n" \ 53 53 "2:\t" PPC_LONG "1b\n" \ 54 54 "\t.short %2\n" \ 55 55 ".org 2b+%3\n" \
+2 -2
arch/s390/include/asm/bug.h
··· 14 14 ".section .rodata.str,\"aMS\",@progbits,1\n" \ 15 15 "2: .asciz \""__FILE__"\"\n" \ 16 16 ".previous\n" \ 17 - ".section __bug_table,\"a\"\n" \ 17 + ".section __bug_table,\"aw\"\n" \ 18 18 "3: .long 1b-3b,2b-3b\n" \ 19 19 " .short %0,%1\n" \ 20 20 " .org 3b+%2\n" \ ··· 30 30 asm volatile( \ 31 31 "0: j 0b+2\n" \ 32 32 "1:\n" \ 33 - ".section __bug_table,\"a\"\n" \ 33 + ".section __bug_table,\"aw\"\n" \ 34 34 "2: .long 1b-2b\n" \ 35 35 " .short %0\n" \ 36 36 " .org 2b+%1\n" \
+2 -2
arch/sh/include/asm/bug.h
··· 24 24 */ 25 25 #ifdef CONFIG_DEBUG_BUGVERBOSE 26 26 #define _EMIT_BUG_ENTRY \ 27 - "\t.pushsection __bug_table,\"a\"\n" \ 27 + "\t.pushsection __bug_table,\"aw\"\n" \ 28 28 "2:\t.long 1b, %O1\n" \ 29 29 "\t.short %O2, %O3\n" \ 30 30 "\t.org 2b+%O4\n" \ 31 31 "\t.popsection\n" 32 32 #else 33 33 #define _EMIT_BUG_ENTRY \ 34 - "\t.pushsection __bug_table,\"a\"\n" \ 34 + "\t.pushsection __bug_table,\"aw\"\n" \ 35 35 "2:\t.long 1b\n" \ 36 36 "\t.short %O3\n" \ 37 37 "\t.org 2b+%O4\n" \
+2 -2
arch/x86/include/asm/bug.h
··· 35 35 #define _BUG_FLAGS(ins, flags) \ 36 36 do { \ 37 37 asm volatile("1:\t" ins "\n" \ 38 - ".pushsection __bug_table,\"a\"\n" \ 38 + ".pushsection __bug_table,\"aw\"\n" \ 39 39 "2:\t" __BUG_REL(1b) "\t# bug_entry::bug_addr\n" \ 40 40 "\t" __BUG_REL(%c0) "\t# bug_entry::file\n" \ 41 41 "\t.word %c1" "\t# bug_entry::line\n" \ ··· 52 52 #define _BUG_FLAGS(ins, flags) \ 53 53 do { \ 54 54 asm volatile("1:\t" ins "\n" \ 55 - ".pushsection __bug_table,\"a\"\n" \ 55 + ".pushsection __bug_table,\"aw\"\n" \ 56 56 "2:\t" __BUG_REL(1b) "\t# bug_entry::bug_addr\n" \ 57 57 "\t.word %c0" "\t# bug_entry::flags\n" \ 58 58 "\t.org 2b+%c1\n" \