Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1564454 > unrolled thread
| Started by | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| First post | 2017-01-22 17:40 +0100 |
| Last post | 2017-01-22 17:40 +0100 |
| Articles | 20 on this page of 28 — 5 participants |
Back to article view | Back to linux.kernel
[PATCH v3 00/20] Finalize separation of extable.h from module.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 14/20] metag: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 13/20] arc: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
Re: [PATCH 13/20] arc: migrate exception table users off module.h and onto extable.h Vineet Gupta <Vineet.Gupta1@synopsys.com> - 2017-01-23 22:20 +0100
[PATCH 06/20] mn10300: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 19/20] core: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 12/20] nios2: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
Re: [PATCH 12/20] nios2: migrate exception table users off module.h and onto extable.h Tobias Klauser <tklauser@distanz.ch> - 2017-01-25 11:00 +0100
[PATCH 05/20] alpha: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 18/20] hexagon: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 16/20] unicore32: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 02/20] ia64: ensure exception table search users include extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 10/20] openrisc: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH v2] openrisc: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-25 22:50 +0100
Re: [PATCH v2] openrisc: migrate exception table users off module.h and onto extable.h Stafford Horne <shorne@gmail.com> - 2017-01-26 07:00 +0100
Re: [PATCH v2] openrisc: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-26 16:00 +0100
[PATCH v2] openrisc: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-25 23:50 +0100
[PATCH 09/20] frv: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 04/20] arm: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 08/20] sh: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 20/20] module.h: remove extable.h include now users have migrated Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
Re: [PATCH 20/20] module.h: remove extable.h include now users have migrated kbuild test robot <lkp@intel.com> - 2017-01-23 00:00 +0100
Re: [PATCH 20/20] module.h: remove extable.h include now users have migrated Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-23 05:20 +0100
[PATCH 03/20] m32r: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 15/20] score: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 17/20] microblaze: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 01/20] ia64: move ia64_done_with_exception out of asm/uaccess.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
[PATCH 07/20] xtensa: migrate exception table users off module.h and onto extable.h Paul Gortmaker <paul.gortmaker@windriver.com> - 2017-01-22 17:40 +0100
Page 1 of 2 [1] 2 Next page →
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-22 17:40 +0100 |
| Subject | [PATCH v3 00/20] Finalize separation of extable.h from module.h |
| Message-ID | <t2tln-33i-3@gated-at.bofh.it> |
If you already read the v2 00/NN, then you can skip this v3; the only change is to add new arch specific patches that extended build coverage and more intelligent regex patterns lead to. Updated copy of the original v2 00/NN text follows: Some of the arch specific changes have already been picked up by the arch maintainers in v1, so I'm assuming the other folks just figured I'd ask Linus to pull the remainder. Which is the current plan ; soak this in linux-next on 4.10-rcN and request a pull in the next merge window. So please shout if you are an arch maintainer and see something here you have questions or comments on. Otherwise, you don't have to do anything. Once all the old users who expected extable content via module.h are gone, then and only then can we remove the back compat line as done in the final patch in this series. I've been build testing this locally on a regular basis in with my other pending work, on a bunch of different architectures, so hopefully we don't see anything go pear shaped when it goes into sfr's linux-next. The only real change in the v1 ---> v2 aside from dropping merged content was the restructuring in the ia64 based on comments from Al Viro to improve some header separation at the same time. I'd resent just those two for follow up comments and nobody seemed to have further suggestions. Note that I'm not able to run test ia64; just compile. There was also a minor context refresh required due to the recent treewide asm/uaccess --> linux/uaccess change, which gave me the motivation to get this out of my queue and finalized. RFC/V1: https://lkml.kernel.org/r/CA+55aFyDw_jK609LcjpWvVMTzCWuH6nLUXiZDeYC2tpSaZqhXA@mail.gmail.com V2: https://lkml.kernel.org/r/20170109204010.5047-1-paul.gortmaker@windriver.com ia64: https://lkml.kernel.org/r/20160920022924.9537-1-paul.gortmaker@windriver.com --- Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Chen Liqin <liqin.linux@gmail.com> Cc: Chris Zankel <chris@zankel.net> Cc: David Howells <dhowells@redhat.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: Guan Xuetao <gxt@mprc.pku.edu.cn> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: James Hogan <james.hogan@imgtec.com> Cc: Jonas Bonn <jonas@southpole.se> Cc: Lennox Wu <lennox.wu@gmail.com> Cc: Ley Foon Tan <lftan@altera.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Matt Turner <mattst88@gmail.com> Cc: Max Filippov <jcmvbkbc@gmail.com> Cc: Michal Simek <monstr@monstr.eu> Cc: Richard Henderson <rth@twiddle.net> Cc: Richard Kuo <rkuo@codeaurora.org> Cc: Rich Felker <dalias@libc.org> Cc: Russell King <linux@armlinux.org.uk> Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Stafford Horne <shorne@gmail.com> Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com> Cc: Tony Luck <tony.luck@intel.com> Cc: Vineet Gupta <vgupta@synopsys.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: linux-alpha@vger.kernel.org Cc: linux-am33-list@redhat.com Cc: linux-arm-kernel@lists.infradead.org Cc: linux-hexagon@vger.kernel.org Cc: linux-ia64@vger.kernel.org Cc: linux-sh@vger.kernel.org Cc: linux-snps-arc@lists.infradead.org Cc: linux-xtensa@linux-xtensa.org Cc: nios2-dev@lists.rocketboards.org Cc: openrisc@lists.librecores.org Cc: sparclinux@vger.kernel.org Paul Gortmaker (20): ia64: move ia64_done_with_exception out of asm/uaccess.h ia64: ensure exception table search users include extable.h m32r: migrate exception table users off module.h and onto extable.h arm: migrate exception table users off module.h and onto extable.h alpha: migrate exception table users off module.h and onto extable.h mn10300: migrate exception table users off module.h and onto extable.h xtensa: migrate exception table users off module.h and onto extable.h sh: migrate exception table users off module.h and onto extable.h frv: migrate exception table users off module.h and onto extable.h openrisc: migrate exception table users off module.h and onto extable.h sparc: migrate exception table users onto extable.h nios2: migrate exception table users off module.h and onto extable.h arc: migrate exception table users off module.h and onto extable.h metag: migrate exception table users off module.h and onto extable.h score: migrate exception table users off module.h and onto extable.h unicore32: migrate exception table users off module.h and onto extable.h microblaze: migrate exception table users off module.h and onto extable.h hexagon: migrate exception table users off module.h and onto extable.h core: migrate exception table users off module.h and onto extable.h module.h: remove extable.h include now users have migrated arch/alpha/kernel/traps.c | 2 +- arch/alpha/mm/fault.c | 2 +- arch/arc/mm/extable.c | 3 ++- arch/arm/mm/extable.c | 2 +- arch/arm/mm/fault.c | 2 +- arch/frv/mm/extable.c | 2 +- arch/hexagon/mm/vm_fault.c | 2 +- arch/ia64/include/asm/exception.h | 35 +++++++++++++++++++++++++++++++++++ arch/ia64/include/asm/uaccess.h | 15 --------------- arch/ia64/kernel/kprobes.c | 4 ++-- arch/ia64/kernel/traps.c | 6 ++++-- arch/ia64/kernel/unaligned.c | 4 +++- arch/ia64/mm/fault.c | 2 ++ arch/m32r/mm/extable.c | 2 +- arch/m32r/mm/fault.c | 2 +- arch/metag/mm/extable.c | 3 +-- arch/microblaze/mm/fault.c | 2 +- arch/mn10300/mm/extable.c | 2 +- arch/mn10300/mm/misalignment.c | 2 +- arch/nios2/mm/extable.c | 2 +- arch/nios2/mm/fault.c | 2 +- arch/openrisc/mm/fault.c | 2 +- arch/score/mm/extable.c | 2 +- arch/score/mm/fault.c | 2 +- arch/sh/include/asm/uaccess.h | 1 - arch/sh/kernel/kprobes.c | 2 +- arch/sh/kernel/traps.c | 3 ++- arch/sh/mm/extable_32.c | 2 +- arch/sh/mm/extable_64.c | 2 +- arch/sparc/mm/extable.c | 1 + arch/unicore32/mm/extable.c | 2 +- arch/unicore32/mm/fault.c | 2 +- arch/xtensa/mm/fault.c | 2 +- include/linux/module.h | 1 - init/main.c | 1 + kernel/extable.c | 1 + kernel/module.c | 1 + 37 files changed, 77 insertions(+), 48 deletions(-) create mode 100644 arch/ia64/include/asm/exception.h -- 2.11.0
[toc] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-22 17:40 +0100 |
| Subject | [PATCH 14/20] metag: migrate exception table users off module.h and onto extable.h |
| Message-ID | <t2tlo-33i-5@gated-at.bofh.it> |
| In reply to | #1564454 |
This file was only including module.h for exception table related functions. We've now separated that content out into its own file "extable.h" so now move over to that and avoid all the extra header content in module.h that we don't really need to compile this file. Cc: James Hogan <james.hogan@imgtec.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- arch/metag/mm/extable.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/metag/mm/extable.c b/arch/metag/mm/extable.c index 2a21eaebe84d..3aa90b78b43d 100644 --- a/arch/metag/mm/extable.c +++ b/arch/metag/mm/extable.c @@ -1,5 +1,4 @@ - -#include <linux/module.h> +#include <linux/extable.h> #include <linux/uaccess.h> int fixup_exception(struct pt_regs *regs) -- 2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-22 17:40 +0100 |
| Subject | [PATCH 13/20] arc: migrate exception table users off module.h and onto extable.h |
| Message-ID | <t2tlo-33i-17@gated-at.bofh.it> |
| In reply to | #1564454 |
This file was only including module.h for exception table related functions. We've now separated that content out into its own file "extable.h" so now move over to that and avoid all the extra header content in module.h that we don't really need to compile this file. Since the file does have some EXPORT_SYMBOL, we add export.h include. Cc: Vineet Gupta <vgupta@synopsys.com> Cc: linux-snps-arc@lists.infradead.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- arch/arc/mm/extable.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arc/mm/extable.c b/arch/arc/mm/extable.c index aa652e281324..c86906b41bfe 100644 --- a/arch/arc/mm/extable.c +++ b/arch/arc/mm/extable.c @@ -8,7 +8,8 @@ * Borrowed heavily from MIPS */ -#include <linux/module.h> +#include <linux/export.h> +#include <linux/extable.h> #include <linux/uaccess.h> int fixup_exception(struct pt_regs *regs) -- 2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Vineet Gupta <Vineet.Gupta1@synopsys.com> |
|---|---|
| Date | 2017-01-23 22:20 +0100 |
| Subject | Re: [PATCH 13/20] arc: migrate exception table users off module.h and onto extable.h |
| Message-ID | <t2UbV-3bl-47@gated-at.bofh.it> |
| In reply to | #1564456 |
On 01/22/2017 08:32 AM, Paul Gortmaker wrote: > This file was only including module.h for exception table related > functions. We've now separated that content out into its own file > "extable.h" so now move over to that and avoid all the extra header > content in module.h that we don't really need to compile this file. > Since the file does have some EXPORT_SYMBOL, we add export.h include. > > Cc: Vineet Gupta <vgupta@synopsys.com> > Cc: linux-snps-arc@lists.infradead.org > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Acked-by: Vineet Gupta <vgupta@synopsys.com> Thx, -Vineet
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-22 17:40 +0100 |
| Subject | [PATCH 06/20] mn10300: migrate exception table users off module.h and onto extable.h |
| Message-ID | <t2tlo-33i-29@gated-at.bofh.it> |
| In reply to | #1564454 |
These files were only including module.h for exception table related functions. We've now separated that content out into its own file "extable.h" so now move over to that and avoid all the extra header content in module.h that we don't really need to compile these files. Cc: David Howells <dhowells@redhat.com> Cc: linux-am33-list@redhat.com Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- arch/mn10300/mm/extable.c | 2 +- arch/mn10300/mm/misalignment.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/mn10300/mm/extable.c b/arch/mn10300/mm/extable.c index 305de461cb8f..045a903ee6b9 100644 --- a/arch/mn10300/mm/extable.c +++ b/arch/mn10300/mm/extable.c @@ -8,7 +8,7 @@ * as published by the Free Software Foundation; either version * 2 of the Licence, or (at your option) any later version. */ -#include <linux/module.h> +#include <linux/extable.h> #include <linux/spinlock.h> #include <linux/uaccess.h> diff --git a/arch/mn10300/mm/misalignment.c b/arch/mn10300/mm/misalignment.c index 31d04da85743..b39a388825ae 100644 --- a/arch/mn10300/mm/misalignment.c +++ b/arch/mn10300/mm/misalignment.c @@ -8,7 +8,7 @@ * as published by the Free Software Foundation; either version * 2 of the Licence, or (at your option) any later version. */ -#include <linux/module.h> +#include <linux/extable.h> #include <linux/sched.h> #include <linux/kernel.h> #include <linux/string.h> -- 2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-22 17:40 +0100 |
| Subject | [PATCH 19/20] core: migrate exception table users off module.h and onto extable.h |
| Message-ID | <t2tlo-33i-15@gated-at.bofh.it> |
| In reply to | #1564454 |
These files were including module.h for exception table related
functions. We've now separated that content out into its own file
"extable.h" so now move over to that and where possible, avoid all
the extra header content in module.h that we don't really need to
compile these non-modular files.
Note:
init/main.c still needs module.h for __init_or_module
kernel/extable.c still needs module.h for is_module_text_address
...and so we don't get the benefit of removing module.h from the cpp
feed for these two files, unlike the almost universal 1:1 exchange
of module.h for extable.h we were able to do in the arch dirs.
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
init/main.c | 1 +
kernel/extable.c | 1 +
kernel/module.c | 1 +
3 files changed, 3 insertions(+)
diff --git a/init/main.c b/init/main.c
index b0c9d6facef9..5b244bc1c176 100644
--- a/init/main.c
+++ b/init/main.c
@@ -12,6 +12,7 @@
#define DEBUG /* Enable initcall_debug */
#include <linux/types.h>
+#include <linux/extable.h>
#include <linux/module.h>
#include <linux/proc_fs.h>
#include <linux/kernel.h>
diff --git a/kernel/extable.c b/kernel/extable.c
index e3beec4a2339..b25d9901e431 100644
--- a/kernel/extable.c
+++ b/kernel/extable.c
@@ -17,6 +17,7 @@
*/
#include <linux/ftrace.h>
#include <linux/memory.h>
+#include <linux/extable.h>
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/init.h>
diff --git a/kernel/module.c b/kernel/module.c
index 5088784c0cf9..43b6fb20fdf4 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -17,6 +17,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/export.h>
+#include <linux/extable.h>
#include <linux/moduleloader.h>
#include <linux/trace_events.h>
#include <linux/init.h>
--
2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-22 17:40 +0100 |
| Subject | [PATCH 12/20] nios2: migrate exception table users off module.h and onto extable.h |
| Message-ID | <t2tlp-33i-37@gated-at.bofh.it> |
| In reply to | #1564454 |
This file was only including module.h for exception table related functions. We've now separated that content out into its own file "extable.h" so now move over to that and avoid all the extra header content in module.h that we don't really need to compile this file. Reported-by: kbuild test robot <lkp@intel.com> Cc: Ley Foon Tan <lftan@altera.com> Cc: nios2-dev@lists.rocketboards.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- arch/nios2/mm/extable.c | 2 +- arch/nios2/mm/fault.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/nios2/mm/extable.c b/arch/nios2/mm/extable.c index 4d2fc5a589d0..2574dba0407d 100644 --- a/arch/nios2/mm/extable.c +++ b/arch/nios2/mm/extable.c @@ -8,7 +8,7 @@ * for more details. */ -#include <linux/module.h> +#include <linux/extable.h> #include <linux/uaccess.h> int fixup_exception(struct pt_regs *regs) diff --git a/arch/nios2/mm/fault.c b/arch/nios2/mm/fault.c index affc4eb3f89e..e7a14e1e0d6b 100644 --- a/arch/nios2/mm/fault.c +++ b/arch/nios2/mm/fault.c @@ -21,7 +21,7 @@ #include <linux/ptrace.h> #include <linux/mman.h> #include <linux/mm.h> -#include <linux/module.h> +#include <linux/extable.h> #include <linux/uaccess.h> #include <linux/ptrace.h> -- 2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Tobias Klauser <tklauser@distanz.ch> |
|---|---|
| Date | 2017-01-25 11:00 +0100 |
| Subject | Re: [PATCH 12/20] nios2: migrate exception table users off module.h and onto extable.h |
| Message-ID | <t3swW-6x-13@gated-at.bofh.it> |
| In reply to | #1564459 |
On 2017-01-22 at 17:32:36 +0100, Paul Gortmaker <paul.gortmaker@windriver.com> wrote: > This file was only including module.h for exception table related > functions. We've now separated that content out into its own file > "extable.h" so now move over to that and avoid all the extra header > content in module.h that we don't really need to compile this file. > > Reported-by: kbuild test robot <lkp@intel.com> > Cc: Ley Foon Tan <lftan@altera.com> > Cc: nios2-dev@lists.rocketboards.org > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Reviewed-by: Tobias Klauser <tklauser@distanz.ch>
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-22 17:40 +0100 |
| Subject | [PATCH 05/20] alpha: migrate exception table users off module.h and onto extable.h |
| Message-ID | <t2tlp-33i-41@gated-at.bofh.it> |
| In reply to | #1564454 |
These files were only including module.h for exception table related functions. We've now separated that content out into its own file "extable.h" so now move over to that and avoid all the extra header content in module.h that we don't really need to compile these files. Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Matt Turner <mattst88@gmail.com> Cc: linux-alpha@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- arch/alpha/kernel/traps.c | 2 +- arch/alpha/mm/fault.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c index 3328af7c2776..af2994206b4b 100644 --- a/arch/alpha/kernel/traps.c +++ b/arch/alpha/kernel/traps.c @@ -13,7 +13,7 @@ #include <linux/sched.h> #include <linux/tty.h> #include <linux/delay.h> -#include <linux/module.h> +#include <linux/extable.h> #include <linux/kallsyms.h> #include <linux/ratelimit.h> diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c index 83e9eee57a55..47948b4dd157 100644 --- a/arch/alpha/mm/fault.c +++ b/arch/alpha/mm/fault.c @@ -22,7 +22,7 @@ #include <linux/mman.h> #include <linux/smp.h> #include <linux/interrupt.h> -#include <linux/module.h> +#include <linux/extable.h> #include <linux/uaccess.h> extern void die_if_kernel(char *,struct pt_regs *,long, unsigned long *); -- 2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-22 17:40 +0100 |
| Subject | [PATCH 18/20] hexagon: migrate exception table users off module.h and onto extable.h |
| Message-ID | <t2tlp-33i-47@gated-at.bofh.it> |
| In reply to | #1564454 |
This file was only including module.h for exception table related functions. We've now separated that content out into its own file "extable.h" so now move over to that and avoid all the extra header content in module.h that we don't really need to compile this file. Cc: Richard Kuo <rkuo@codeaurora.org> Cc: linux-hexagon@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- arch/hexagon/mm/vm_fault.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/hexagon/mm/vm_fault.c b/arch/hexagon/mm/vm_fault.c index de863d6d802b..489875fd2be4 100644 --- a/arch/hexagon/mm/vm_fault.c +++ b/arch/hexagon/mm/vm_fault.c @@ -29,7 +29,7 @@ #include <linux/uaccess.h> #include <linux/mm.h> #include <linux/signal.h> -#include <linux/module.h> +#include <linux/extable.h> #include <linux/hardirq.h> /* -- 2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-22 17:40 +0100 |
| Subject | [PATCH 16/20] unicore32: migrate exception table users off module.h and onto extable.h |
| Message-ID | <t2tlp-33i-49@gated-at.bofh.it> |
| In reply to | #1564454 |
This file was only including module.h for exception table related functions. We've now separated that content out into its own file "extable.h" so now move over to that and avoid all the extra header content in module.h that we don't really need to compile this file. Cc: Guan Xuetao <gxt@mprc.pku.edu.cn> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- arch/unicore32/mm/extable.c | 2 +- arch/unicore32/mm/fault.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/unicore32/mm/extable.c b/arch/unicore32/mm/extable.c index 6564180eb285..c562046947ba 100644 --- a/arch/unicore32/mm/extable.c +++ b/arch/unicore32/mm/extable.c @@ -9,7 +9,7 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include <linux/module.h> +#include <linux/extable.h> #include <linux/uaccess.h> int fixup_exception(struct pt_regs *regs) diff --git a/arch/unicore32/mm/fault.c b/arch/unicore32/mm/fault.c index 6c7f70bcaae3..b656d216a8a8 100644 --- a/arch/unicore32/mm/fault.c +++ b/arch/unicore32/mm/fault.c @@ -9,7 +9,7 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include <linux/module.h> +#include <linux/extable.h> #include <linux/signal.h> #include <linux/mm.h> #include <linux/hardirq.h> -- 2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-22 17:40 +0100 |
| Subject | [PATCH 02/20] ia64: ensure exception table search users include extable.h |
| Message-ID | <t2tlp-33i-43@gated-at.bofh.it> |
| In reply to | #1564454 |
We start with a delete of a duplicate prototype in asm/exception.h
that no longer needs to exist, as it duplicates content in extable.h
and since that header is so small, there is no point trying to
avoid using it.
Then we make sure anyone using search_exception_tables directly or
via the ia64_done_with_exception macro has included extable.h
In the process, we remove an include of moduleloader.h that was
apparently not really required; it would have been fetching in
module.h and hence the previous location of the exception search
function prototypes, but we need not rely on that anymore.
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-ia64@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
arch/ia64/include/asm/exception.h | 1 -
arch/ia64/kernel/kprobes.c | 2 +-
arch/ia64/kernel/traps.c | 3 ++-
arch/ia64/kernel/unaligned.c | 1 +
arch/ia64/mm/fault.c | 1 +
5 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/ia64/include/asm/exception.h b/arch/ia64/include/asm/exception.h
index d90236090e8c..6bb246dcdaeb 100644
--- a/arch/ia64/include/asm/exception.h
+++ b/arch/ia64/include/asm/exception.h
@@ -19,7 +19,6 @@ struct exception_table_entry;
extern void ia64_handle_exception(struct pt_regs *regs,
const struct exception_table_entry *e);
-extern const struct exception_table_entry *search_exception_tables(unsigned long addr);
#define ia64_done_with_exception(regs) \
({ \
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 55b18e1b67a8..f5f3a5e6fcd1 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -28,7 +28,7 @@
#include <linux/string.h>
#include <linux/slab.h>
#include <linux/preempt.h>
-#include <linux/moduleloader.h>
+#include <linux/extable.h>
#include <linux/kdebug.h>
#include <asm/pgtable.h>
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c
index d3e1f1ee465f..8981ce98afb3 100644
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
@@ -12,7 +12,8 @@
#include <linux/sched.h>
#include <linux/tty.h>
#include <linux/vt_kern.h> /* For unblank_screen() */
-#include <linux/module.h> /* for EXPORT_SYMBOL */
+#include <linux/export.h>
+#include <linux/extable.h>
#include <linux/hardirq.h>
#include <linux/kprobes.h>
#include <linux/delay.h> /* for ssleep() */
diff --git a/arch/ia64/kernel/unaligned.c b/arch/ia64/kernel/unaligned.c
index e697403b0ec1..99348d7f2255 100644
--- a/arch/ia64/kernel/unaligned.c
+++ b/arch/ia64/kernel/unaligned.c
@@ -17,6 +17,7 @@
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/tty.h>
+#include <linux/extable.h>
#include <linux/ratelimit.h>
#include <linux/uaccess.h>
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
index 52b41dad9704..7f2feb21753c 100644
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -7,6 +7,7 @@
#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/mm.h>
+#include <linux/extable.h>
#include <linux/interrupt.h>
#include <linux/kprobes.h>
#include <linux/kdebug.h>
--
2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-22 17:40 +0100 |
| Subject | [PATCH 10/20] openrisc: migrate exception table users off module.h and onto extable.h |
| Message-ID | <t2tlp-33i-53@gated-at.bofh.it> |
| In reply to | #1564454 |
This file was only including module.h for exception table related functions. We've now separated that content out into its own file "extable.h" so now move over to that and avoid all the extra header content in module.h that we don't really need to compile these files. Reported-by: kbuild test robot <lkp@intel.com> Cc: Jonas Bonn <jonas@southpole.se> Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> Cc: Stafford Horne <shorne@gmail.com> Cc: openrisc@lists.librecores.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- arch/openrisc/mm/fault.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/openrisc/mm/fault.c b/arch/openrisc/mm/fault.c index b1a7435e786a..53592a639744 100644 --- a/arch/openrisc/mm/fault.c +++ b/arch/openrisc/mm/fault.c @@ -17,7 +17,7 @@ #include <linux/mm.h> #include <linux/interrupt.h> -#include <linux/module.h> +#include <linux/extable.h> #include <linux/sched.h> #include <linux/uaccess.h> -- 2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-25 22:50 +0100 |
| Subject | [PATCH v2] openrisc: migrate exception table users off module.h and onto extable.h |
| Message-ID | <t3DC2-7dw-13@gated-at.bofh.it> |
| In reply to | #1564465 |
These files were only including module.h for exception table related functions. We've now separated that content out into its own file "extable.h" so now move over to that and avoid all the extra header content in module.h that we don't really need to compile these files. Reported-by: kbuild test robot <lkp@intel.com> Cc: Jonas Bonn <jonas@southpole.se> Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> Cc: Stafford Horne <shorne@gmail.com> Cc: openrisc@lists.librecores.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- [v2: add traps.c to conversion, as without a toolchain, I'm at the mercy of the things found by kbuild; fixing them iteratively... ] arch/openrisc/kernel/traps.c | 2 +- arch/openrisc/mm/fault.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/openrisc/kernel/traps.c b/arch/openrisc/kernel/traps.c index a4574cb4b0fb..73abb3ff4fa3 100644 --- a/arch/openrisc/kernel/traps.c +++ b/arch/openrisc/kernel/traps.c @@ -23,7 +23,7 @@ #include <linux/init.h> #include <linux/sched.h> #include <linux/kernel.h> -#include <linux/module.h> +#include <linux/exception.h> #include <linux/kmod.h> #include <linux/string.h> #include <linux/errno.h> diff --git a/arch/openrisc/mm/fault.c b/arch/openrisc/mm/fault.c index b1a7435e786a..53592a639744 100644 --- a/arch/openrisc/mm/fault.c +++ b/arch/openrisc/mm/fault.c @@ -17,7 +17,7 @@ #include <linux/mm.h> #include <linux/interrupt.h> -#include <linux/module.h> +#include <linux/extable.h> #include <linux/sched.h> #include <linux/uaccess.h> -- 2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Stafford Horne <shorne@gmail.com> |
|---|---|
| Date | 2017-01-26 07:00 +0100 |
| Subject | Re: [PATCH v2] openrisc: migrate exception table users off module.h and onto extable.h |
| Message-ID | <t3Lge-3vx-9@gated-at.bofh.it> |
| In reply to | #1566983 |
On Wed, Jan 25, 2017 at 04:40:46PM -0500, Paul Gortmaker wrote: > These files were only including module.h for exception table related > functions. We've now separated that content out into its own file > "extable.h" so now move over to that and avoid all the extra header > content in module.h that we don't really need to compile these files. > > Reported-by: kbuild test robot <lkp@intel.com> > Cc: Jonas Bonn <jonas@southpole.se> > Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> > Cc: Stafford Horne <shorne@gmail.com> > Cc: openrisc@lists.librecores.org > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> > --- > > [v2: add traps.c to conversion, as without a toolchain, I'm at the > mercy of the things found by kbuild; fixing them iteratively... ] > > arch/openrisc/kernel/traps.c | 2 +- > arch/openrisc/mm/fault.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/openrisc/kernel/traps.c b/arch/openrisc/kernel/traps.c > index a4574cb4b0fb..73abb3ff4fa3 100644 > --- a/arch/openrisc/kernel/traps.c > +++ b/arch/openrisc/kernel/traps.c > @@ -23,7 +23,7 @@ > #include <linux/init.h> > #include <linux/sched.h> > #include <linux/kernel.h> > -#include <linux/module.h> > +#include <linux/exception.h> Is this correct or did you want extable.h? > #include <linux/kmod.h> > #include <linux/string.h> > #include <linux/errno.h> > diff --git a/arch/openrisc/mm/fault.c b/arch/openrisc/mm/fault.c > index b1a7435e786a..53592a639744 100644 > --- a/arch/openrisc/mm/fault.c > +++ b/arch/openrisc/mm/fault.c > @@ -17,7 +17,7 @@ > > #include <linux/mm.h> > #include <linux/interrupt.h> > -#include <linux/module.h> > +#include <linux/extable.h> > #include <linux/sched.h> > > #include <linux/uaccess.h> > -- > 2.11.0 >
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-26 16:00 +0100 |
| Subject | Re: [PATCH v2] openrisc: migrate exception table users off module.h and onto extable.h |
| Message-ID | <t3TGP-cu-31@gated-at.bofh.it> |
| In reply to | #1567124 |
[Re: [PATCH v2] openrisc: migrate exception table users off module.h and onto extable.h] On 26/01/2017 (Thu 14:53) Stafford Horne wrote: > On Wed, Jan 25, 2017 at 04:40:46PM -0500, Paul Gortmaker wrote: > > These files were only including module.h for exception table related > > functions. We've now separated that content out into its own file > > "extable.h" so now move over to that and avoid all the extra header > > content in module.h that we don't really need to compile these files. > > > > Reported-by: kbuild test robot <lkp@intel.com> > > Cc: Jonas Bonn <jonas@southpole.se> > > Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> > > Cc: Stafford Horne <shorne@gmail.com> > > Cc: openrisc@lists.librecores.org > > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> > > --- > > > > [v2: add traps.c to conversion, as without a toolchain, I'm at the > > mercy of the things found by kbuild; fixing them iteratively... ] > > > > arch/openrisc/kernel/traps.c | 2 +- > > arch/openrisc/mm/fault.c | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/arch/openrisc/kernel/traps.c b/arch/openrisc/kernel/traps.c > > index a4574cb4b0fb..73abb3ff4fa3 100644 > > --- a/arch/openrisc/kernel/traps.c > > +++ b/arch/openrisc/kernel/traps.c > > @@ -23,7 +23,7 @@ > > #include <linux/init.h> > > #include <linux/sched.h> > > #include <linux/kernel.h> > > -#include <linux/module.h> > > +#include <linux/exception.h> > > Is this correct or did you want extable.h? Gah, of course. Thanks for spotting that. It will be good to have a working cross compiler for or32 someday to spot thinko items like this. Thanks, Paul. -- > > > #include <linux/kmod.h> > > #include <linux/string.h> > > #include <linux/errno.h> > > diff --git a/arch/openrisc/mm/fault.c b/arch/openrisc/mm/fault.c > > index b1a7435e786a..53592a639744 100644 > > --- a/arch/openrisc/mm/fault.c > > +++ b/arch/openrisc/mm/fault.c > > @@ -17,7 +17,7 @@ > > > > #include <linux/mm.h> > > #include <linux/interrupt.h> > > -#include <linux/module.h> > > +#include <linux/extable.h> > > #include <linux/sched.h> > > > > #include <linux/uaccess.h> > > -- > > 2.11.0 > >
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-25 23:50 +0100 |
| Subject | [PATCH v2] openrisc: migrate exception table users off module.h and onto extable.h |
| Message-ID | <t3Ey6-7NV-9@gated-at.bofh.it> |
| In reply to | #1564465 |
These files were only including module.h for exception table related functions. We've now separated that content out into its own file "extable.h" so now move over to that and avoid all the extra header content in module.h that we don't really need to compile these files. Reported-by: kbuild test robot <lkp@intel.com> Cc: Jonas Bonn <jonas@southpole.se> Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> Cc: Stafford Horne <shorne@gmail.com> Cc: openrisc@lists.librecores.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- [v2: add traps.c to conversion, as without a toolchain, I'm at the mercy of the things found by kbuild; fixing them iteratively... ] arch/openrisc/kernel/traps.c | 2 +- arch/openrisc/mm/fault.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/openrisc/kernel/traps.c b/arch/openrisc/kernel/traps.c index a4574cb4b0fb..73abb3ff4fa3 100644 --- a/arch/openrisc/kernel/traps.c +++ b/arch/openrisc/kernel/traps.c @@ -23,7 +23,7 @@ #include <linux/init.h> #include <linux/sched.h> #include <linux/kernel.h> -#include <linux/module.h> +#include <linux/exception.h> #include <linux/kmod.h> #include <linux/string.h> #include <linux/errno.h> diff --git a/arch/openrisc/mm/fault.c b/arch/openrisc/mm/fault.c index b1a7435e786a..53592a639744 100644 --- a/arch/openrisc/mm/fault.c +++ b/arch/openrisc/mm/fault.c @@ -17,7 +17,7 @@ #include <linux/mm.h> #include <linux/interrupt.h> -#include <linux/module.h> +#include <linux/extable.h> #include <linux/sched.h> #include <linux/uaccess.h> -- 2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-22 17:40 +0100 |
| Subject | [PATCH 09/20] frv: migrate exception table users off module.h and onto extable.h |
| Message-ID | <t2tlq-33i-63@gated-at.bofh.it> |
| In reply to | #1564454 |
This file was only including module.h for exception table related functions. We've now separated that content out into its own file "extable.h" so now move over to that and avoid all the extra header content in module.h that we don't really need to compile this file. Reported-by: kbuild test robot <lkp@intel.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- arch/frv/mm/extable.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/frv/mm/extable.c b/arch/frv/mm/extable.c index 9a641c1b085a..a0e8b3e03e4c 100644 --- a/arch/frv/mm/extable.c +++ b/arch/frv/mm/extable.c @@ -2,7 +2,7 @@ * linux/arch/frv/mm/extable.c */ -#include <linux/module.h> +#include <linux/extable.h> #include <linux/spinlock.h> #include <linux/uaccess.h> -- 2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-22 17:40 +0100 |
| Subject | [PATCH 04/20] arm: migrate exception table users off module.h and onto extable.h |
| Message-ID | <t2tlq-33i-65@gated-at.bofh.it> |
| In reply to | #1564454 |
These files were only including module.h for exception table related functions. We've now separated that content out into its own file "extable.h" so now move over to that and avoid all the extra header content in module.h that we don't really need to compile these files. Cc: Russell King <linux@armlinux.org.uk> Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- arch/arm/mm/extable.c | 2 +- arch/arm/mm/fault.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mm/extable.c b/arch/arm/mm/extable.c index 312e15e6d00b..f436f7439e46 100644 --- a/arch/arm/mm/extable.c +++ b/arch/arm/mm/extable.c @@ -1,7 +1,7 @@ /* * linux/arch/arm/mm/extable.c */ -#include <linux/module.h> +#include <linux/extable.h> #include <linux/uaccess.h> int fixup_exception(struct pt_regs *regs) diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 3a2e678b8d30..94de590db99e 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -8,7 +8,7 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -#include <linux/module.h> +#include <linux/extable.h> #include <linux/signal.h> #include <linux/mm.h> #include <linux/hardirq.h> -- 2.11.0
[toc] | [prev] | [next] | [standalone]
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Date | 2017-01-22 17:40 +0100 |
| Subject | [PATCH 08/20] sh: migrate exception table users off module.h and onto extable.h |
| Message-ID | <t2tlq-33i-67@gated-at.bofh.it> |
| In reply to | #1564454 |
These files were only including module.h for exception table
related functions. We've now separated that content out into its
own file "extable.h" so now move over to that and avoid all the
extra header content in module.h that we don't really need to compile
these files.
One uses "print_modules" so that prevents us removing module.h in
that case, however.
We also delete a duplicate prototype that doesn't need to exist, as
it duplicates content in extable.h
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: linux-sh@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
arch/sh/include/asm/uaccess.h | 1 -
arch/sh/kernel/kprobes.c | 2 +-
arch/sh/kernel/traps.c | 3 ++-
arch/sh/mm/extable_32.c | 2 +-
arch/sh/mm/extable_64.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/sh/include/asm/uaccess.h b/arch/sh/include/asm/uaccess.h
index a38d0c7b818f..c4f0fee812c3 100644
--- a/arch/sh/include/asm/uaccess.h
+++ b/arch/sh/include/asm/uaccess.h
@@ -192,7 +192,6 @@ struct exception_table_entry {
#endif
int fixup_exception(struct pt_regs *regs);
-const struct exception_table_entry *search_exception_tables(unsigned long addr);
extern void *set_exception_table_vec(unsigned int vec, void *handler);
diff --git a/arch/sh/kernel/kprobes.c b/arch/sh/kernel/kprobes.c
index 1653ff64b103..52a5e11247d1 100644
--- a/arch/sh/kernel/kprobes.c
+++ b/arch/sh/kernel/kprobes.c
@@ -9,7 +9,7 @@
* for more details.
*/
#include <linux/kprobes.h>
-#include <linux/module.h>
+#include <linux/extable.h>
#include <linux/ptrace.h>
#include <linux/preempt.h>
#include <linux/kdebug.h>
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
index dfdad72c61ca..9513fa7840aa 100644
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -8,7 +8,8 @@
#include <linux/hardirq.h>
#include <linux/kernel.h>
#include <linux/kexec.h>
-#include <linux/module.h>
+#include <linux/extable.h>
+#include <linux/module.h> /* print_modules */
#include <asm/unwinder.h>
#include <asm/traps.h>
diff --git a/arch/sh/mm/extable_32.c b/arch/sh/mm/extable_32.c
index 9cfcbb5848e4..24a75d315dcb 100644
--- a/arch/sh/mm/extable_32.c
+++ b/arch/sh/mm/extable_32.c
@@ -4,7 +4,7 @@
* linux/arch/i386/mm/extable.c
*/
-#include <linux/module.h>
+#include <linux/extable.h>
#include <linux/uaccess.h>
int fixup_exception(struct pt_regs *regs)
diff --git a/arch/sh/mm/extable_64.c b/arch/sh/mm/extable_64.c
index 96edaff8c983..b90cdfad2c78 100644
--- a/arch/sh/mm/extable_64.c
+++ b/arch/sh/mm/extable_64.c
@@ -11,7 +11,7 @@
* for more details.
*/
#include <linux/rwsem.h>
-#include <linux/module.h>
+#include <linux/extable.h>
#include <linux/uaccess.h>
extern unsigned long copy_user_memcpy, copy_user_memcpy_end;
--
2.11.0
[toc] | [prev] | [next] | [standalone]
Page 1 of 2 [1] 2 Next page →
Back to top | Article view | linux.kernel
csiph-web