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

sh: migrate exception table users off module.h and onto extable.h 



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: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent 6cc306ea

arch/sh/include/asm/uaccess.h

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

arch/sh/kernel/kprobes.c

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

arch/sh/kernel/traps.c

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

arch/sh/mm/extable_32.c

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

arch/sh/mm/extable_64.c

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE