diff for duplicates of <20180102113417.GA5078@sudip-tp> diff --git a/a/1.txt b/N1/1.txt index f6deea4..a5e6451 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ Hi Arnd, -On Tue, Jan 02, 2018@11:31:12AM +0100, Arnd Bergmann wrote: +On Tue, Jan 02, 2018 at 11:31:12AM +0100, Arnd Bergmann wrote: > We now have exports in both architecture code in in common code, > which causes a link failure when symbol versioning is eanbled, on > four architectures: diff --git a/a/content_digest b/N1/content_digest index af03838..246aab4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,12 +2,12 @@ "From\0sudipm.mukherjee@gmail.com (Sudip Mukherjee)\0" "Subject\0[PATCH] arch: drop duplicate exports of abort()\0" "Date\0Tue, 2 Jan 2018 11:34:45 +0000\0" - "To\0linux-snps-arc@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Arnd,\n" "\n" - "On Tue, Jan 02, 2018@11:31:12AM +0100, Arnd Bergmann wrote:\n" + "On Tue, Jan 02, 2018 at 11:31:12AM +0100, Arnd Bergmann wrote:\n" "> We now have exports in both architecture code in in common code,\n" "> which causes a link failure when symbol versioning is eanbled, on\n" "> four architectures:\n" @@ -96,4 +96,4 @@ " {\n" " \treturn;" -f0b3d1ccbdc35b92f45cab5df7b44ca6cddb6f5671297a2b710f234fe349215b +4b759a2c3e568d00fd973f5e58bb47a1832c3a8c311bee37d309fdef0892431d
diff --git a/a/1.txt b/N2/1.txt index f6deea4..6ddb636 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,6 +1,6 @@ Hi Arnd, -On Tue, Jan 02, 2018@11:31:12AM +0100, Arnd Bergmann wrote: +On Tue, Jan 02, 2018 at 11:31:12AM +0100, Arnd Bergmann wrote: > We now have exports in both architecture code in in common code, > which causes a link failure when symbol versioning is eanbled, on > four architectures: @@ -18,73 +18,3 @@ weak function was done. Like in the attached patch.. -- Regards Sudip --------------- next part -------------- -diff --git a/arch/arc/kernel/traps.c b/arch/arc/kernel/traps.c -index 51a55b0..133a4da 100644 ---- a/arch/arc/kernel/traps.c -+++ b/arch/arc/kernel/traps.c -@@ -169,4 +169,3 @@ void abort(void) - { - __asm__ __volatile__("trap_s 5\n"); - } --EXPORT_SYMBOL(abort); -diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c -index e344bdd..917b425 100644 ---- a/arch/arm/kernel/traps.c -+++ b/arch/arm/kernel/traps.c -@@ -786,15 +786,6 @@ asmlinkage void __div0(void) - } - EXPORT_SYMBOL(__div0); - --void abort(void) --{ -- BUG(); -- -- /* if that doesn't kill us, halt */ -- panic("Oops failed to kill thread"); --} --EXPORT_SYMBOL(abort); -- - void __init trap_init(void) - { - return; -diff --git a/arch/m32r/kernel/traps.c b/arch/m32r/kernel/traps.c -index cb79fba..a6f300a 100644 ---- a/arch/m32r/kernel/traps.c -+++ b/arch/m32r/kernel/traps.c -@@ -115,15 +115,6 @@ static void set_eit_vector_entries(void) - _flush_cache_copyback_all(); - } - --void abort(void) --{ -- BUG(); -- -- /* if that doesn't kill us, halt */ -- panic("Oops failed to kill thread"); --} --EXPORT_SYMBOL(abort); -- - void __init trap_init(void) - { - set_eit_vector_entries(); -diff --git a/arch/unicore32/kernel/traps.c b/arch/unicore32/kernel/traps.c -index 5f25b39..30d6613 100644 ---- a/arch/unicore32/kernel/traps.c -+++ b/arch/unicore32/kernel/traps.c -@@ -291,15 +291,6 @@ asmlinkage void __div0(void) - } - EXPORT_SYMBOL(__div0); - --void abort(void) --{ -- BUG(); -- -- /* if that doesn't kill us, halt */ -- panic("Oops failed to kill thread"); --} --EXPORT_SYMBOL(abort); -- - void __init trap_init(void) - { - return; diff --git a/N2/2.hdr b/N2/2.hdr new file mode 100644 index 0000000..1cfab86 --- /dev/null +++ b/N2/2.hdr @@ -0,0 +1,2 @@ +Content-Type: text/plain; charset=us-ascii +Content-Disposition: attachment; filename=patch diff --git a/N2/2.txt b/N2/2.txt new file mode 100644 index 0000000..6d03f50 --- /dev/null +++ b/N2/2.txt @@ -0,0 +1,69 @@ +diff --git a/arch/arc/kernel/traps.c b/arch/arc/kernel/traps.c +index 51a55b0..133a4da 100644 +--- a/arch/arc/kernel/traps.c ++++ b/arch/arc/kernel/traps.c +@@ -169,4 +169,3 @@ void abort(void) + { + __asm__ __volatile__("trap_s 5\n"); + } +-EXPORT_SYMBOL(abort); +diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c +index e344bdd..917b425 100644 +--- a/arch/arm/kernel/traps.c ++++ b/arch/arm/kernel/traps.c +@@ -786,15 +786,6 @@ asmlinkage void __div0(void) + } + EXPORT_SYMBOL(__div0); + +-void abort(void) +-{ +- BUG(); +- +- /* if that doesn't kill us, halt */ +- panic("Oops failed to kill thread"); +-} +-EXPORT_SYMBOL(abort); +- + void __init trap_init(void) + { + return; +diff --git a/arch/m32r/kernel/traps.c b/arch/m32r/kernel/traps.c +index cb79fba..a6f300a 100644 +--- a/arch/m32r/kernel/traps.c ++++ b/arch/m32r/kernel/traps.c +@@ -115,15 +115,6 @@ static void set_eit_vector_entries(void) + _flush_cache_copyback_all(); + } + +-void abort(void) +-{ +- BUG(); +- +- /* if that doesn't kill us, halt */ +- panic("Oops failed to kill thread"); +-} +-EXPORT_SYMBOL(abort); +- + void __init trap_init(void) + { + set_eit_vector_entries(); +diff --git a/arch/unicore32/kernel/traps.c b/arch/unicore32/kernel/traps.c +index 5f25b39..30d6613 100644 +--- a/arch/unicore32/kernel/traps.c ++++ b/arch/unicore32/kernel/traps.c +@@ -291,15 +291,6 @@ asmlinkage void __div0(void) + } + EXPORT_SYMBOL(__div0); + +-void abort(void) +-{ +- BUG(); +- +- /* if that doesn't kill us, halt */ +- panic("Oops failed to kill thread"); +-} +-EXPORT_SYMBOL(abort); +- + void __init trap_init(void) + { + return; diff --git a/a/content_digest b/N2/content_digest index af03838..a90ed8b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,13 +1,20 @@ "ref\020180102103311.706364-1-arnd@arndb.de\0" - "From\0sudipm.mukherjee@gmail.com (Sudip Mukherjee)\0" - "Subject\0[PATCH] arch: drop duplicate exports of abort()\0" + "From\0Sudip Mukherjee <sudipm.mukherjee@gmail.com>\0" + "Subject\0Re: [PATCH] arch: drop duplicate exports of abort()\0" "Date\0Tue, 2 Jan 2018 11:34:45 +0000\0" - "To\0linux-snps-arc@lists.infradead.org\0" - "\00:1\0" + "To\0Arnd Bergmann <arnd@arndb.de>\0" + "Cc\0Andrew Morton <akpm@linux-foundation.org>" + Vineet Gupta <vgupta@synopsys.com> + Russell King <linux@armlinux.org.uk> + Jose Abreu <Jose.Abreu@synopsys.com> + linux-snps-arc@lists.infradead.org + linux-kernel@vger.kernel.org + " linux-arm-kernel@lists.infradead.org\0" + "\01:1\0" "b\0" "Hi Arnd,\n" "\n" - "On Tue, Jan 02, 2018@11:31:12AM +0100, Arnd Bergmann wrote:\n" + "On Tue, Jan 02, 2018 at 11:31:12AM +0100, Arnd Bergmann wrote:\n" "> We now have exports in both architecture code in in common code,\n" "> which causes a link failure when symbol versioning is eanbled, on\n" "> four architectures:\n" @@ -24,8 +31,10 @@ "\n" "--\n" "Regards\n" - "Sudip\n" - "-------------- next part --------------\n" + Sudip + "\01:2\0" + "fn\0patch\0" + "b\0" "diff --git a/arch/arc/kernel/traps.c b/arch/arc/kernel/traps.c\n" "index 51a55b0..133a4da 100644\n" "--- a/arch/arc/kernel/traps.c\n" @@ -96,4 +105,4 @@ " {\n" " \treturn;" -f0b3d1ccbdc35b92f45cab5df7b44ca6cddb6f5671297a2b710f234fe349215b +da039037babce4f48d0ff43ea529c6a1df7d4f7c9e6c5008c1e0ba9f0b6d672f
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.