diff options
Diffstat (limited to 'arch/mn10300/kernel')
-rw-r--r-- | arch/mn10300/kernel/ptrace.c | 1 | ||||
-rw-r--r-- | arch/mn10300/kernel/signal.c | 1 | ||||
-rw-r--r-- | arch/mn10300/kernel/sys_mn10300.c | 2 | ||||
-rw-r--r-- | arch/mn10300/kernel/traps.c | 22 | ||||
-rw-r--r-- | arch/mn10300/kernel/vmlinux.lds.S | 4 |
5 files changed, 10 insertions, 20 deletions
diff --git a/arch/mn10300/kernel/ptrace.c b/arch/mn10300/kernel/ptrace.c index e143339ad28e..cf847dabc1bd 100644 --- a/arch/mn10300/kernel/ptrace.c +++ b/arch/mn10300/kernel/ptrace.c | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
14 | #include <linux/mm.h> | 14 | #include <linux/mm.h> |
15 | #include <linux/smp.h> | 15 | #include <linux/smp.h> |
16 | #include <linux/smp_lock.h> | ||
17 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
18 | #include <linux/ptrace.h> | 17 | #include <linux/ptrace.h> |
19 | #include <linux/user.h> | 18 | #include <linux/user.h> |
diff --git a/arch/mn10300/kernel/signal.c b/arch/mn10300/kernel/signal.c index 9f7572a0f578..feb2f2e810db 100644 --- a/arch/mn10300/kernel/signal.c +++ b/arch/mn10300/kernel/signal.c | |||
@@ -12,7 +12,6 @@ | |||
12 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
13 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
14 | #include <linux/smp.h> | 14 | #include <linux/smp.h> |
15 | #include <linux/smp_lock.h> | ||
16 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
17 | #include <linux/signal.h> | 16 | #include <linux/signal.h> |
18 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
diff --git a/arch/mn10300/kernel/sys_mn10300.c b/arch/mn10300/kernel/sys_mn10300.c index bca5a84dc72c..3e52a1054327 100644 --- a/arch/mn10300/kernel/sys_mn10300.c +++ b/arch/mn10300/kernel/sys_mn10300.c | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <linux/syscalls.h> | 13 | #include <linux/syscalls.h> |
14 | #include <linux/mm.h> | 14 | #include <linux/mm.h> |
15 | #include <linux/smp.h> | 15 | #include <linux/smp.h> |
16 | #include <linux/smp_lock.h> | ||
17 | #include <linux/sem.h> | 16 | #include <linux/sem.h> |
18 | #include <linux/msg.h> | 17 | #include <linux/msg.h> |
19 | #include <linux/shm.h> | 18 | #include <linux/shm.h> |
@@ -21,7 +20,6 @@ | |||
21 | #include <linux/mman.h> | 20 | #include <linux/mman.h> |
22 | #include <linux/file.h> | 21 | #include <linux/file.h> |
23 | #include <linux/utsname.h> | 22 | #include <linux/utsname.h> |
24 | #include <linux/syscalls.h> | ||
25 | #include <linux/tty.h> | 23 | #include <linux/tty.h> |
26 | 24 | ||
27 | #include <asm/uaccess.h> | 25 | #include <asm/uaccess.h> |
diff --git a/arch/mn10300/kernel/traps.c b/arch/mn10300/kernel/traps.c index 681ad8c9e4fb..91365adba4f5 100644 --- a/arch/mn10300/kernel/traps.c +++ b/arch/mn10300/kernel/traps.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/timer.h> | 17 | #include <linux/timer.h> |
18 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
19 | #include <linux/smp.h> | 19 | #include <linux/smp.h> |
20 | #include <linux/smp_lock.h> | ||
21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
22 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
23 | #include <linux/spinlock.h> | 22 | #include <linux/spinlock.h> |
@@ -136,8 +135,7 @@ void show_trace(unsigned long *sp) | |||
136 | unsigned long *stack, addr, module_start, module_end; | 135 | unsigned long *stack, addr, module_start, module_end; |
137 | int i; | 136 | int i; |
138 | 137 | ||
139 | printk(KERN_EMERG "\n" | 138 | printk(KERN_EMERG "\nCall Trace:"); |
140 | KERN_EMERG "Call Trace:"); | ||
141 | 139 | ||
142 | stack = sp; | 140 | stack = sp; |
143 | i = 0; | 141 | i = 0; |
@@ -153,7 +151,7 @@ void show_trace(unsigned long *sp) | |||
153 | printk("\n"); | 151 | printk("\n"); |
154 | #else | 152 | #else |
155 | if ((i % 6) == 0) | 153 | if ((i % 6) == 0) |
156 | printk("\n" KERN_EMERG " "); | 154 | printk(KERN_EMERG " "); |
157 | printk("[<%08lx>] ", addr); | 155 | printk("[<%08lx>] ", addr); |
158 | i++; | 156 | i++; |
159 | #endif | 157 | #endif |
@@ -180,7 +178,7 @@ void show_stack(struct task_struct *task, unsigned long *sp) | |||
180 | if (((long) stack & (THREAD_SIZE - 1)) == 0) | 178 | if (((long) stack & (THREAD_SIZE - 1)) == 0) |
181 | break; | 179 | break; |
182 | if ((i % 8) == 0) | 180 | if ((i % 8) == 0) |
183 | printk("\n" KERN_EMERG " "); | 181 | printk(KERN_EMERG " "); |
184 | printk("%08lx ", *stack++); | 182 | printk("%08lx ", *stack++); |
185 | } | 183 | } |
186 | 184 | ||
@@ -264,8 +262,7 @@ void show_registers(struct pt_regs *regs) | |||
264 | show_stack(current, (unsigned long *) sp); | 262 | show_stack(current, (unsigned long *) sp); |
265 | 263 | ||
266 | #if 0 | 264 | #if 0 |
267 | printk(KERN_EMERG "\n" | 265 | printk(KERN_EMERG "\nCode: "); |
268 | KERN_EMERG "Code: "); | ||
269 | if (regs->pc < PAGE_OFFSET) | 266 | if (regs->pc < PAGE_OFFSET) |
270 | goto bad; | 267 | goto bad; |
271 | 268 | ||
@@ -311,16 +308,14 @@ void die(const char *str, struct pt_regs *regs, enum exception_code code) | |||
311 | { | 308 | { |
312 | console_verbose(); | 309 | console_verbose(); |
313 | spin_lock_irq(&die_lock); | 310 | spin_lock_irq(&die_lock); |
314 | printk(KERN_EMERG "\n" | 311 | printk(KERN_EMERG "\n%s: %04x\n", |
315 | KERN_EMERG "%s: %04x\n", | ||
316 | str, code & 0xffff); | 312 | str, code & 0xffff); |
317 | show_registers(regs); | 313 | show_registers(regs); |
318 | 314 | ||
319 | if (regs->pc >= 0x02000000 && regs->pc < 0x04000000 && | 315 | if (regs->pc >= 0x02000000 && regs->pc < 0x04000000 && |
320 | (regs->epsw & (EPSW_IM | EPSW_IE)) != (EPSW_IM | EPSW_IE)) { | 316 | (regs->epsw & (EPSW_IM | EPSW_IE)) != (EPSW_IM | EPSW_IE)) { |
321 | printk(KERN_EMERG "Exception in usermode interrupt handler\n"); | 317 | printk(KERN_EMERG "Exception in usermode interrupt handler\n"); |
322 | printk(KERN_EMERG "\n" | 318 | printk(KERN_EMERG "\nPlease connect to kernel debugger !!\n"); |
323 | KERN_EMERG " Please connect to kernel debugger !!\n"); | ||
324 | asm volatile ("0: bra 0b"); | 319 | asm volatile ("0: bra 0b"); |
325 | } | 320 | } |
326 | 321 | ||
@@ -429,9 +424,8 @@ asmlinkage void io_bus_error(u32 bcberr, u32 bcbear, struct pt_regs *regs) | |||
429 | { | 424 | { |
430 | console_verbose(); | 425 | console_verbose(); |
431 | 426 | ||
432 | printk(KERN_EMERG "\n" | 427 | printk(KERN_EMERG "Asynchronous I/O Bus Error\n"); |
433 | KERN_EMERG "Asynchronous I/O Bus Error\n" | 428 | printk(KERN_EMERG "==========================\n"); |
434 | KERN_EMERG "==========================\n"); | ||
435 | 429 | ||
436 | if (bcberr & BCBERR_BEME) | 430 | if (bcberr & BCBERR_BEME) |
437 | printk(KERN_EMERG "- Multiple recorded errors\n"); | 431 | printk(KERN_EMERG "- Multiple recorded errors\n"); |
diff --git a/arch/mn10300/kernel/vmlinux.lds.S b/arch/mn10300/kernel/vmlinux.lds.S index bcebcefb4ad7..f4aa07934654 100644 --- a/arch/mn10300/kernel/vmlinux.lds.S +++ b/arch/mn10300/kernel/vmlinux.lds.S | |||
@@ -61,7 +61,7 @@ SECTIONS | |||
61 | _edata = .; /* End of data section */ | 61 | _edata = .; /* End of data section */ |
62 | } | 62 | } |
63 | 63 | ||
64 | .data.init_task : { INIT_TASK(THREAD_SIZE); } | 64 | .data.init_task : { INIT_TASK_DATA(THREAD_SIZE); } |
65 | 65 | ||
66 | /* might get freed after init */ | 66 | /* might get freed after init */ |
67 | . = ALIGN(PAGE_SIZE); | 67 | . = ALIGN(PAGE_SIZE); |
@@ -107,7 +107,7 @@ SECTIONS | |||
107 | __init_end = .; | 107 | __init_end = .; |
108 | /* freed after init ends here */ | 108 | /* freed after init ends here */ |
109 | 109 | ||
110 | BSS(4) | 110 | BSS_SECTION(0, PAGE_SIZE, 4) |
111 | 111 | ||
112 | _end = . ; | 112 | _end = . ; |
113 | 113 | ||