Commit e7088170 authored by Paul Gortmaker's avatar Paul Gortmaker
Browse files

ia64: ensure exception table search users include extable.h 



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: linux-ia64@vger.kernel.org
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent 82ed1ac9

arch/ia64/include/asm/exception.h

+0 −1
Original line number Diff line number Diff line
@@ -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)					  \

({									  \

arch/ia64/kernel/kprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

arch/ia64/kernel/traps.c

+2 −1
Original line number Diff line number Diff line
@@ -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() */

arch/ia64/kernel/unaligned.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

arch/ia64/mm/fault.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

CRA Git | Maintained and supported by SUSTech CRA and CCSE