diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-11-09 17:59:53 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2007-11-09 17:59:53 +0900 |
| commit | 06e5fda18491b5ab3419bddc36f3de5b4f7142a9 (patch) | |
| tree | ac9309a5a2fadc5bbf95af8be65c3a230c68fb77 | |
| parent | 3d9144c222ee52c924a96781163f5d6f6b93858a (diff) | |
| parent | c26056bc488567ff769d8623e169598e4fd5d21a (diff) | |
| download | kernel_samsung_crespo-06e5fda18491b5ab3419bddc36f3de5b4f7142a9.zip kernel_samsung_crespo-06e5fda18491b5ab3419bddc36f3de5b4f7142a9.tar.gz kernel_samsung_crespo-06e5fda18491b5ab3419bddc36f3de5b4f7142a9.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6
| -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 ceb9458..0761af4 100644 --- a/arch/sh64/kernel/process.c +++ b/arch/sh64/kernel/process.c @@ -26,6 +26,7 @@ #include <linux/reboot.h> #include <linux/init.h> #include <linux/module.h> +#include <linux/proc_fs.h> #include <asm/uaccess.h> #include <asm/pgtable.h> @@ -656,9 +657,6 @@ unsigned long get_wchan(struct task_struct *p) */ #if defined(CONFIG_SH64_PROC_ASIDS) -#include <linux/init.h> -#include <linux/proc_fs.h> - static int asids_proc_info(char *buf, char **start, off_t fpos, int length, int *eof, void *data) { @@ -686,10 +684,8 @@ asids_proc_info(char *buf, char **start, off_t fpos, int length, int *eof, void static int __init register_proc_asids(void) { - create_proc_read_entry("asids", 0, NULL, asids_proc_info, NULL); - return 0; + create_proc_read_entry("asids", 0, NULL, asids_proc_info, NULL); + return 0; } - __initcall(register_proc_asids); #endif - diff --git a/arch/sh64/kernel/traps.c b/arch/sh64/kernel/traps.c index c03101f..f32df38 100644 --- a/arch/sh64/kernel/traps.c +++ b/arch/sh64/kernel/traps.c @@ -30,7 +30,6 @@ #include <linux/interrupt.h> #include <linux/sysctl.h> #include <linux/module.h> - #include <asm/system.h> #include <asm/uaccess.h> #include <asm/io.h> @@ -242,9 +241,6 @@ DO_ERROR(12, SIGILL, "reserved instruction", reserved_inst, current) #endif /* CONFIG_SH64_ID2815_WORKAROUND */ - -#include <asm/system.h> - /* Called with interrupts disabled */ asmlinkage void do_exception_error(unsigned long ex, struct pt_regs *regs) { @@ -984,4 +980,3 @@ asmlinkage void do_debug_interrupt(unsigned long code, struct pt_regs *regs) /* Clear all DEBUGINT causes */ poke_real_address_q(DM_EXP_CAUSE_PHY, 0x0); } - |