Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a6109fd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 921edf31 325cdacd

MAINTAINERS

+5 −1
Original line number Diff line number Diff line
@@ -10684,7 +10684,6 @@ F: drivers/ptp/* 
F:	include/linux/ptp_cl*



PTRACE SUPPORT

M:	Roland McGrath <roland@hack.frob.com>

M:	Oleg Nesterov <oleg@redhat.com>

S:	Maintained

F:	include/asm-generic/syscall.h
@@ -10692,7 +10691,12 @@ F: include/linux/ptrace.h 
F:	include/linux/regset.h

F:	include/linux/tracehook.h

F:	include/uapi/linux/ptrace.h

F:	include/uapi/linux/ptrace.h

F:	include/asm-generic/ptrace.h

F:	kernel/ptrace.c

F:	arch/*/ptrace*.c

F:	arch/*/*/ptrace*.c

F:	arch/*/include/asm/ptrace*.h



PULSE8-CEC DRIVER

M:	Hans Verkuil <hverkuil@xs4all.nl>

arch/arm/include/asm/bug.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ do { \ 
		".pushsection .rodata.str, \"aMS\", %progbits, 1\n" \

		"2:\t.asciz " #__file "\n" 			\

		".popsection\n" 				\

		".pushsection __bug_table,\"a\"\n"		\

		".pushsection __bug_table,\"aw\"\n"		\

		".align 2\n"					\

		"3:\t.word 1b, 2b\n"				\

		"\t.hword " #__line ", 0\n"			\

arch/arm64/include/asm/bug.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#ifdef CONFIG_GENERIC_BUG



#define __BUG_ENTRY(flags) 				\

		".pushsection __bug_table,\"a\"\n\t"	\

		".pushsection __bug_table,\"aw\"\n\t"	\

		".align 2\n\t"				\

	"0:	.long 1f - 0b\n\t"			\

_BUGVERBOSE_LOCATION(__FILE__, __LINE__)		\

arch/blackfin/include/asm/bug.h

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#define _BUG_OR_WARN(flags)						\

	asm volatile(							\

		"1:	.hword	%0\n"					\

		"	.section __bug_table,\"a\",@progbits\n"		\

		"	.section __bug_table,\"aw\",@progbits\n"	\

		"2:	.long	1b\n"					\

		"	.long	%1\n"					\

		"	.short	%2\n"					\
@@ -38,7 +38,7 @@ 
#define _BUG_OR_WARN(flags)						\

	asm volatile(							\

		"1:	.hword	%0\n"					\

		"	.section __bug_table,\"a\",@progbits\n"		\

		"	.section __bug_table,\"aw\",@progbits\n"	\

		"2:	.long	1b\n"					\

		"	.short	%1\n"					\

		"	.org	2b + %2\n"				\

arch/mn10300/include/asm/bug.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ do { \ 
	asm volatile(						\

		"	syscall 15			\n"	\

		"0:					\n"	\

		"	.section __bug_table,\"a\"	\n"	\

		"	.section __bug_table,\"aw\"	\n"	\

		"	.long 0b,%0,%1			\n"	\

		"	.previous			\n"	\

		:						\