linux-arch.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>,
	Yoshinori Sato <ysato@users.sourceforge.jp>,
	Rich Felker <dalias@libc.org>,
	linux-sh@vger.kernel.org
Subject: [PATCH 08/10] sh: migrate exception table users off module.h and onto extable.h
Date: Mon, 9 Jan 2017 15:40:08 -0500	[thread overview]
Message-ID: <20170109204010.5047-9-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <20170109204010.5047-1-paul.gortmaker@windriver.com>

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


  parent reply	other threads:[~2017-01-09 20:40 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-09 20:40 [PATCH v2 00/10] Finalize separation of extable.h from module.h Paul Gortmaker
2017-01-09 20:40 ` Paul Gortmaker
2017-01-09 20:40 ` [PATCH 01/10] ia64: move ia64_done_with_exception out of asm/uaccess.h Paul Gortmaker
2017-01-09 20:40 ` [PATCH 02/10] ia64: ensure exception table search users include extable.h Paul Gortmaker
2017-01-09 20:40   ` Paul Gortmaker
2017-01-09 20:40 ` [PATCH 03/10] m32r: migrate exception table users off module.h and onto extable.h Paul Gortmaker
2017-01-09 20:40   ` Paul Gortmaker
2017-01-10 22:49   ` Sudip Mukherjee
2017-01-10 22:49     ` Sudip Mukherjee
2017-01-09 20:40 ` [PATCH 04/10] arm: " Paul Gortmaker
2017-01-09 20:40   ` Paul Gortmaker
2017-01-09 20:40 ` [PATCH 05/10] alpha: " Paul Gortmaker
2017-01-09 20:40   ` Paul Gortmaker
2017-01-09 20:40 ` [PATCH 06/10] mn10300: " Paul Gortmaker
2017-01-09 20:40 ` [PATCH 07/10] xtensa: " Paul Gortmaker
2017-01-09 20:40   ` Paul Gortmaker
2017-01-09 20:40 ` Paul Gortmaker [this message]
2017-01-09 20:40   ` [PATCH 08/10] sh: " Paul Gortmaker
2017-01-09 20:40 ` [PATCH 09/10] core: " Paul Gortmaker
2017-01-09 20:40   ` Paul Gortmaker
2017-01-09 20:40 ` [PATCH 10/10] module.h: remove extable.h include now users have migrated Paul Gortmaker
2017-01-09 20:40   ` Paul Gortmaker
2017-01-10  2:24   ` kbuild test robot
2017-01-10  2:24     ` kbuild test robot
2017-01-10  2:26   ` kbuild test robot
2017-01-10  2:26     ` kbuild test robot
2017-01-24  0:16 ` [PATCH v2 00/10] Finalize separation of extable.h from module.h Rusty Russell
2017-01-24  0:16   ` Rusty Russell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170109204010.5047-9-paul.gortmaker@windriver.com \
    --to=paul.gortmaker@windriver.com \
    --cc=dalias@libc.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=ysato@users.sourceforge.jp \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).