diff options
Diffstat (limited to 'arch/sh/kernel')
-rw-r--r-- | arch/sh/kernel/cpu/sh3/entry.S | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/clock-sh73180.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/clock-sh7343.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/clock-sh7770.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/clock-sh7780.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/early_printk.c | 18 | ||||
-rw-r--r-- | arch/sh/kernel/ptrace.c | 1 | ||||
-rw-r--r-- | arch/sh/kernel/sh_ksyms.c | 1 | ||||
-rw-r--r-- | arch/sh/kernel/signal.c | 1 | ||||
-rw-r--r-- | arch/sh/kernel/stacktrace.c | 9 | ||||
-rw-r--r-- | arch/sh/kernel/sys_sh.c | 1 | ||||
-rw-r--r-- | arch/sh/kernel/timers/timer-cmt.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/timers/timer-mtu2.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/timers/timer-tmu.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/vsyscall/vsyscall.c | 2 |
15 files changed, 16 insertions, 33 deletions
diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S index f3e827f29a46..832c0b4a1e6c 100644 --- a/arch/sh/kernel/cpu/sh3/entry.S +++ b/arch/sh/kernel/cpu/sh3/entry.S | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sh/kernel/entry.S | 2 | * arch/sh/kernel/cpu/sh3/entry.S |
3 | * | 3 | * |
4 | * Copyright (C) 1999, 2000, 2002 Niibe Yutaka | 4 | * Copyright (C) 1999, 2000, 2002 Niibe Yutaka |
5 | * Copyright (C) 2003 - 2006 Paul Mundt | 5 | * Copyright (C) 2003 - 2006 Paul Mundt |
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh73180.c b/arch/sh/kernel/cpu/sh4a/clock-sh73180.c index 2fa5cb2ae68d..6d5ba373a75e 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh73180.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh73180.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sh/kernel/cpu/sh4/clock-sh73180.c | 2 | * arch/sh/kernel/cpu/sh4a/clock-sh73180.c |
3 | * | 3 | * |
4 | * SH73180 support for the clock framework | 4 | * SH73180 support for the clock framework |
5 | * | 5 | * |
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7343.c b/arch/sh/kernel/cpu/sh4a/clock-sh7343.c index 1707a213f0cf..7adc4f16e95a 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7343.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7343.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sh/kernel/cpu/sh4/clock-sh7343.c | 2 | * arch/sh/kernel/cpu/sh4a/clock-sh7343.c |
3 | * | 3 | * |
4 | * SH7343/SH7722 support for the clock framework | 4 | * SH7343/SH7722 support for the clock framework |
5 | * | 5 | * |
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7770.c b/arch/sh/kernel/cpu/sh4a/clock-sh7770.c index c8694bac6477..8e236062c721 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7770.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7770.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sh/kernel/cpu/sh4/clock-sh7770.c | 2 | * arch/sh/kernel/cpu/sh4a/clock-sh7770.c |
3 | * | 3 | * |
4 | * SH7770 support for the clock framework | 4 | * SH7770 support for the clock framework |
5 | * | 5 | * |
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7780.c b/arch/sh/kernel/cpu/sh4a/clock-sh7780.c index 9e6a216750c8..01f3da619d3d 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7780.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7780.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sh/kernel/cpu/sh4/clock-sh7780.c | 2 | * arch/sh/kernel/cpu/sh4a/clock-sh7780.c |
3 | * | 3 | * |
4 | * SH7780 support for the clock framework | 4 | * SH7780 support for the clock framework |
5 | * | 5 | * |
diff --git a/arch/sh/kernel/early_printk.c b/arch/sh/kernel/early_printk.c index 9048c0326d87..9833493d8867 100644 --- a/arch/sh/kernel/early_printk.c +++ b/arch/sh/kernel/early_printk.c | |||
@@ -192,20 +192,14 @@ int __init setup_early_printk(char *buf) | |||
192 | } | 192 | } |
193 | #endif | 193 | #endif |
194 | 194 | ||
195 | if (likely(early_console)) | 195 | if (likely(early_console)) { |
196 | if (keep_early) | ||
197 | early_console->flags &= ~CON_BOOT; | ||
198 | else | ||
199 | early_console->flags |= CON_BOOT; | ||
196 | register_console(early_console); | 200 | register_console(early_console); |
201 | } | ||
197 | 202 | ||
198 | return 0; | 203 | return 0; |
199 | } | 204 | } |
200 | early_param("earlyprintk", setup_early_printk); | 205 | early_param("earlyprintk", setup_early_printk); |
201 | |||
202 | void __init disable_early_printk(void) | ||
203 | { | ||
204 | if (!early_console_initialized || !early_console) | ||
205 | return; | ||
206 | if (!keep_early) { | ||
207 | printk("disabling early console\n"); | ||
208 | unregister_console(early_console); | ||
209 | } else | ||
210 | printk("keeping early console\n"); | ||
211 | } | ||
diff --git a/arch/sh/kernel/ptrace.c b/arch/sh/kernel/ptrace.c index 855f7246cfff..3fb5fc0b550d 100644 --- a/arch/sh/kernel/ptrace.c +++ b/arch/sh/kernel/ptrace.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/errno.h> | 15 | #include <linux/errno.h> |
17 | #include <linux/ptrace.h> | 16 | #include <linux/ptrace.h> |
18 | #include <linux/user.h> | 17 | #include <linux/user.h> |
diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms.c index 17f0b50c5678..fa91641c1f62 100644 --- a/arch/sh/kernel/sh_ksyms.c +++ b/arch/sh/kernel/sh_ksyms.c | |||
@@ -5,7 +5,6 @@ | |||
5 | #include <linux/sched.h> | 5 | #include <linux/sched.h> |
6 | #include <linux/in6.h> | 6 | #include <linux/in6.h> |
7 | #include <linux/interrupt.h> | 7 | #include <linux/interrupt.h> |
8 | #include <linux/smp_lock.h> | ||
9 | #include <linux/vmalloc.h> | 8 | #include <linux/vmalloc.h> |
10 | #include <linux/pci.h> | 9 | #include <linux/pci.h> |
11 | #include <linux/irq.h> | 10 | #include <linux/irq.h> |
diff --git a/arch/sh/kernel/signal.c b/arch/sh/kernel/signal.c index 9f39ef1f73da..eb0191c374b6 100644 --- a/arch/sh/kernel/signal.c +++ b/arch/sh/kernel/signal.c | |||
@@ -11,7 +11,6 @@ | |||
11 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
12 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
13 | #include <linux/smp.h> | 13 | #include <linux/smp.h> |
14 | #include <linux/smp_lock.h> | ||
15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
16 | #include <linux/signal.h> | 15 | #include <linux/signal.h> |
17 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
diff --git a/arch/sh/kernel/stacktrace.c b/arch/sh/kernel/stacktrace.c index 0d5268afe80f..4bdd2f83535d 100644 --- a/arch/sh/kernel/stacktrace.c +++ b/arch/sh/kernel/stacktrace.c | |||
@@ -19,14 +19,7 @@ | |||
19 | */ | 19 | */ |
20 | void save_stack_trace(struct stack_trace *trace, struct task_struct *task) | 20 | void save_stack_trace(struct stack_trace *trace, struct task_struct *task) |
21 | { | 21 | { |
22 | unsigned long *sp; | 22 | unsigned long *sp = (unsigned long *)current_stack_pointer; |
23 | |||
24 | if (!task) | ||
25 | task = current; | ||
26 | if (task == current) | ||
27 | sp = (unsigned long *)current_stack_pointer; | ||
28 | else | ||
29 | sp = (unsigned long *)task->thread.sp; | ||
30 | 23 | ||
31 | while (!kstack_end(sp)) { | 24 | while (!kstack_end(sp)) { |
32 | unsigned long addr = *sp++; | 25 | unsigned long addr = *sp++; |
diff --git a/arch/sh/kernel/sys_sh.c b/arch/sh/kernel/sys_sh.c index e18f183e1035..76b1bc7f7029 100644 --- a/arch/sh/kernel/sys_sh.c +++ b/arch/sh/kernel/sys_sh.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/sem.h> | 15 | #include <linux/sem.h> |
17 | #include <linux/msg.h> | 16 | #include <linux/msg.h> |
18 | #include <linux/shm.h> | 17 | #include <linux/shm.h> |
diff --git a/arch/sh/kernel/timers/timer-cmt.c b/arch/sh/kernel/timers/timer-cmt.c index a574b93a4e7b..82de6895ade5 100644 --- a/arch/sh/kernel/timers/timer-cmt.c +++ b/arch/sh/kernel/timers/timer-cmt.c | |||
@@ -115,7 +115,7 @@ static irqreturn_t cmt_timer_interrupt(int irq, void *dev_id) | |||
115 | static struct irqaction cmt_irq = { | 115 | static struct irqaction cmt_irq = { |
116 | .name = "timer", | 116 | .name = "timer", |
117 | .handler = cmt_timer_interrupt, | 117 | .handler = cmt_timer_interrupt, |
118 | .flags = IRQF_DISABLED | IRQF_TIMER, | 118 | .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, |
119 | .mask = CPU_MASK_NONE, | 119 | .mask = CPU_MASK_NONE, |
120 | }; | 120 | }; |
121 | 121 | ||
diff --git a/arch/sh/kernel/timers/timer-mtu2.c b/arch/sh/kernel/timers/timer-mtu2.c index fffcd1c09873..b7499a2a9188 100644 --- a/arch/sh/kernel/timers/timer-mtu2.c +++ b/arch/sh/kernel/timers/timer-mtu2.c | |||
@@ -110,7 +110,7 @@ static irqreturn_t mtu2_timer_interrupt(int irq, void *dev_id) | |||
110 | static struct irqaction mtu2_irq = { | 110 | static struct irqaction mtu2_irq = { |
111 | .name = "timer", | 111 | .name = "timer", |
112 | .handler = mtu2_timer_interrupt, | 112 | .handler = mtu2_timer_interrupt, |
113 | .flags = IRQF_DISABLED | IRQF_TIMER, | 113 | .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, |
114 | .mask = CPU_MASK_NONE, | 114 | .mask = CPU_MASK_NONE, |
115 | }; | 115 | }; |
116 | 116 | ||
diff --git a/arch/sh/kernel/timers/timer-tmu.c b/arch/sh/kernel/timers/timer-tmu.c index ad1ede52fc9c..d9e3151c891e 100644 --- a/arch/sh/kernel/timers/timer-tmu.c +++ b/arch/sh/kernel/timers/timer-tmu.c | |||
@@ -99,7 +99,7 @@ static irqreturn_t tmu_timer_interrupt(int irq, void *dummy) | |||
99 | static struct irqaction tmu_irq = { | 99 | static struct irqaction tmu_irq = { |
100 | .name = "timer", | 100 | .name = "timer", |
101 | .handler = tmu_timer_interrupt, | 101 | .handler = tmu_timer_interrupt, |
102 | .flags = IRQF_DISABLED | IRQF_TIMER, | 102 | .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, |
103 | .mask = CPU_MASK_NONE, | 103 | .mask = CPU_MASK_NONE, |
104 | }; | 104 | }; |
105 | 105 | ||
diff --git a/arch/sh/kernel/vsyscall/vsyscall.c b/arch/sh/kernel/vsyscall/vsyscall.c index 7b0f66f03319..e146bafcd14f 100644 --- a/arch/sh/kernel/vsyscall/vsyscall.c +++ b/arch/sh/kernel/vsyscall/vsyscall.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sh/kernel/vsyscall.c | 2 | * arch/sh/kernel/vsyscall/vsyscall.c |
3 | * | 3 | * |
4 | * Copyright (C) 2006 Paul Mundt | 4 | * Copyright (C) 2006 Paul Mundt |
5 | * | 5 | * |