Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1564464
| From | Paul Gortmaker <paul.gortmaker@windriver.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 02/20] ia64: ensure exception table search users include extable.h |
| Date | 2017-01-22 17:40 +0100 |
| Message-ID | <t2tlp-33i-43@gated-at.bofh.it> (permalink) |
| References | <t2tln-33i-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll 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