Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1564468

[PATCH 08/20] sh: migrate exception table users off module.h and onto extable.h

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[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

csiph-web