diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-11-04 22:18:17 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-11-04 22:18:17 -0500 |
commit | c26056bc488567ff769d8623e169598e4fd5d21a (patch) | |
tree | 99a4d801dd126ff31d20bdb1add8f7132615c8bc | |
parent | b55d1b1814c52463c11707f53dbdc223e09b2924 (diff) |
sh64: Kill off duplicate includes.
Follow the sh change.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | arch/sh64/kernel/process.c | 10 | ||||
-rw-r--r-- | arch/sh64/kernel/traps.c | 5 |
2 files changed, 3 insertions, 12 deletions
diff --git a/arch/sh64/kernel/process.c b/arch/sh64/kernel/process.c index ceb9458abda4..0761af4d2a42 100644 --- a/arch/sh64/kernel/process.c +++ b/arch/sh64/kernel/process.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/reboot.h> | 26 | #include <linux/reboot.h> |
27 | #include <linux/init.h> | 27 | #include <linux/init.h> |
28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
29 | #include <linux/proc_fs.h> | ||
29 | #include <asm/uaccess.h> | 30 | #include <asm/uaccess.h> |
30 | #include <asm/pgtable.h> | 31 | #include <asm/pgtable.h> |
31 | 32 | ||
@@ -656,9 +657,6 @@ unsigned long get_wchan(struct task_struct *p) | |||
656 | */ | 657 | */ |
657 | 658 | ||
658 | #if defined(CONFIG_SH64_PROC_ASIDS) | 659 | #if defined(CONFIG_SH64_PROC_ASIDS) |
659 | #include <linux/init.h> | ||
660 | #include <linux/proc_fs.h> | ||
661 | |||
662 | static int | 660 | static int |
663 | asids_proc_info(char *buf, char **start, off_t fpos, int length, int *eof, void *data) | 661 | asids_proc_info(char *buf, char **start, off_t fpos, int length, int *eof, void *data) |
664 | { | 662 | { |
@@ -686,10 +684,8 @@ asids_proc_info(char *buf, char **start, off_t fpos, int length, int *eof, void | |||
686 | 684 | ||
687 | static int __init register_proc_asids(void) | 685 | static int __init register_proc_asids(void) |
688 | { | 686 | { |
689 | create_proc_read_entry("asids", 0, NULL, asids_proc_info, NULL); | 687 | create_proc_read_entry("asids", 0, NULL, asids_proc_info, NULL); |
690 | return 0; | 688 | return 0; |
691 | } | 689 | } |
692 | |||
693 | __initcall(register_proc_asids); | 690 | __initcall(register_proc_asids); |
694 | #endif | 691 | #endif |
695 | |||
diff --git a/arch/sh64/kernel/traps.c b/arch/sh64/kernel/traps.c index c03101fab467..f32df3831f45 100644 --- a/arch/sh64/kernel/traps.c +++ b/arch/sh64/kernel/traps.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <linux/interrupt.h> | 30 | #include <linux/interrupt.h> |
31 | #include <linux/sysctl.h> | 31 | #include <linux/sysctl.h> |
32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
33 | |||
34 | #include <asm/system.h> | 33 | #include <asm/system.h> |
35 | #include <asm/uaccess.h> | 34 | #include <asm/uaccess.h> |
36 | #include <asm/io.h> | 35 | #include <asm/io.h> |
@@ -242,9 +241,6 @@ DO_ERROR(12, SIGILL, "reserved instruction", reserved_inst, current) | |||
242 | 241 | ||
243 | #endif /* CONFIG_SH64_ID2815_WORKAROUND */ | 242 | #endif /* CONFIG_SH64_ID2815_WORKAROUND */ |
244 | 243 | ||
245 | |||
246 | #include <asm/system.h> | ||
247 | |||
248 | /* Called with interrupts disabled */ | 244 | /* Called with interrupts disabled */ |
249 | asmlinkage void do_exception_error(unsigned long ex, struct pt_regs *regs) | 245 | asmlinkage void do_exception_error(unsigned long ex, struct pt_regs *regs) |
250 | { | 246 | { |
@@ -984,4 +980,3 @@ asmlinkage void do_debug_interrupt(unsigned long code, struct pt_regs *regs) | |||
984 | /* Clear all DEBUGINT causes */ | 980 | /* Clear all DEBUGINT causes */ |
985 | poke_real_address_q(DM_EXP_CAUSE_PHY, 0x0); | 981 | poke_real_address_q(DM_EXP_CAUSE_PHY, 0x0); |
986 | } | 982 | } |
987 | |||