kernel/exit.c: export abort() to modules

akpm00 · torvalds · commit dc8635b78cd8 · 2018-01-04T16:45:09.000-08:00
gcc -fisolate-erroneous-paths-dereference can generate calls to abort() from modular code too. [arnd@arndb.de: drop duplicate exports of abort()] Link: http://lkml.kernel.org/r/20180102103311.706364-1-arnd@arndb.de Reported-by: Vineet Gupta <Vineet.Gupta1@synopsys.com> Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Alexey Brodkin <Alexey.Brodkin@synopsys.com> Cc: Russell King <rmk+kernel@armlinux.org.uk> Cc: Jose Abreu <Jose.Abreu@synopsys.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
@@ -793,7 +793,6 @@ void abort(void)
 	/* if that doesn't kill us, halt */
 	panic("Oops failed to kill thread");
 }
-EXPORT_SYMBOL(abort);
 
 void __init trap_init(void)
 {
diff --git a/arch/m32r/kernel/traps.c b/arch/m32r/kernel/traps.c
@@ -122,7 +122,6 @@ void abort(void)
 	/* if that doesn't kill us, halt */
 	panic("Oops failed to kill thread");
 }
-EXPORT_SYMBOL(abort);
 
 void __init trap_init(void)
 {
diff --git a/arch/unicore32/kernel/traps.c b/arch/unicore32/kernel/traps.c
@@ -298,7 +298,6 @@ void abort(void)
 	/* if that doesn't kill us, halt */
 	panic("Oops failed to kill thread");
 }
-EXPORT_SYMBOL(abort);
 
 void __init trap_init(void)
 {
diff --git a/kernel/exit.c b/kernel/exit.c
@@ -1763,3 +1763,4 @@ __weak void abort(void)
 	/* if that doesn't kill us, halt */
 	panic("Oops failed to kill thread");
 }
+EXPORT_SYMBOL(abort);

Original file line number	Diff line number	Diff line change
`@@ -793,7 +793,6 @@ void abort(void)`
`793`	`793`	`/* if that doesn't kill us, halt */`
`794`	`794`	`panic("Oops failed to kill thread");`
`795`	`795`	`}`
`796`		`-EXPORT_SYMBOL(abort);`
`797`	`796`
`798`	`797`	`void __init trap_init(void)`
`799`	`798`	`{`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,6 @@ void abort(void)`
`122`	`122`	`/* if that doesn't kill us, halt */`
`123`	`123`	`panic("Oops failed to kill thread");`
`124`	`124`	`}`
`125`		`-EXPORT_SYMBOL(abort);`
`126`	`125`
`127`	`126`	`void __init trap_init(void)`
`128`	`127`	`{`
Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,6 @@ void abort(void)`
`298`	`298`	`/* if that doesn't kill us, halt */`
`299`	`299`	`panic("Oops failed to kill thread");`
`300`	`300`	`}`
`301`		`-EXPORT_SYMBOL(abort);`
`302`	`301`
`303`	`302`	`void __init trap_init(void)`
`304`	`303`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1763,3 +1763,4 @@ __weak void abort(void)`
`1763`	`1763`	`/* if that doesn't kill us, halt */`
`1764`	`1764`	`panic("Oops failed to kill thread");`
`1765`	`1765`	`}`
	`1766`	`+EXPORT_SYMBOL(abort);`