diff options
Diffstat (limited to 'arch/sh64')
-rw-r--r-- | arch/sh64/kernel/early_printk.c | 8 | ||||
-rw-r--r-- | arch/sh64/kernel/irq.c | 1 | ||||
-rw-r--r-- | arch/sh64/kernel/pci_sh5.c | 1 | ||||
-rw-r--r-- | arch/sh64/kernel/sh_ksyms.c | 1 | ||||
-rw-r--r-- | arch/sh64/kernel/signal.c | 1 | ||||
-rw-r--r-- | arch/sh64/kernel/sys_sh64.c | 1 | ||||
-rw-r--r-- | arch/sh64/kernel/traps.c | 1 | ||||
-rw-r--r-- | arch/sh64/kernel/unwind.c | 6 | ||||
-rw-r--r-- | arch/sh64/kernel/vmlinux.lds.S | 2 | ||||
-rw-r--r-- | arch/sh64/mach-cayman/iomap.c | 1 | ||||
-rw-r--r-- | arch/sh64/mm/fault.c | 1 | ||||
-rw-r--r-- | arch/sh64/mm/hugetlbpage.c | 1 | ||||
-rw-r--r-- | arch/sh64/mm/tlbmiss.c | 1 |
13 files changed, 5 insertions, 21 deletions
diff --git a/arch/sh64/kernel/early_printk.c b/arch/sh64/kernel/early_printk.c index 8c8a76e180aa..4f9131123672 100644 --- a/arch/sh64/kernel/early_printk.c +++ b/arch/sh64/kernel/early_printk.c | |||
@@ -79,7 +79,7 @@ static struct console sh_console = { | |||
79 | .name = "scifcon", | 79 | .name = "scifcon", |
80 | .write = sh_console_write, | 80 | .write = sh_console_write, |
81 | .setup = sh_console_setup, | 81 | .setup = sh_console_setup, |
82 | .flags = CON_PRINTBUFFER, | 82 | .flags = CON_PRINTBUFFER | CON_BOOT, |
83 | .index = -1, | 83 | .index = -1, |
84 | }; | 84 | }; |
85 | 85 | ||
@@ -97,9 +97,3 @@ void __init enable_early_printk(void) | |||
97 | 97 | ||
98 | register_console(&sh_console); | 98 | register_console(&sh_console); |
99 | } | 99 | } |
100 | |||
101 | void disable_early_printk(void) | ||
102 | { | ||
103 | unregister_console(&sh_console); | ||
104 | } | ||
105 | |||
diff --git a/arch/sh64/kernel/irq.c b/arch/sh64/kernel/irq.c index e7e07f8749c9..f68b4f6c9b31 100644 --- a/arch/sh64/kernel/irq.c +++ b/arch/sh64/kernel/irq.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
27 | #include <linux/random.h> | 27 | #include <linux/random.h> |
28 | #include <linux/smp.h> | 28 | #include <linux/smp.h> |
29 | #include <linux/smp_lock.h> | ||
30 | #include <linux/init.h> | 29 | #include <linux/init.h> |
31 | #include <linux/seq_file.h> | 30 | #include <linux/seq_file.h> |
32 | #include <linux/bitops.h> | 31 | #include <linux/bitops.h> |
diff --git a/arch/sh64/kernel/pci_sh5.c b/arch/sh64/kernel/pci_sh5.c index 9dae689b6a9b..49862e165c06 100644 --- a/arch/sh64/kernel/pci_sh5.c +++ b/arch/sh64/kernel/pci_sh5.c | |||
@@ -12,7 +12,6 @@ | |||
12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
13 | #include <linux/rwsem.h> | 13 | #include <linux/rwsem.h> |
14 | #include <linux/smp.h> | 14 | #include <linux/smp.h> |
15 | #include <linux/smp_lock.h> | ||
16 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
18 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
diff --git a/arch/sh64/kernel/sh_ksyms.c b/arch/sh64/kernel/sh_ksyms.c index 7aa4b4f7bc5e..461ea3de316f 100644 --- a/arch/sh64/kernel/sh_ksyms.c +++ b/arch/sh64/kernel/sh_ksyms.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
18 | #include <linux/in6.h> | 18 | #include <linux/in6.h> |
19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
20 | #include <linux/smp_lock.h> | ||
21 | #include <linux/screen_info.h> | 20 | #include <linux/screen_info.h> |
22 | 21 | ||
23 | #include <asm/semaphore.h> | 22 | #include <asm/semaphore.h> |
diff --git a/arch/sh64/kernel/signal.c b/arch/sh64/kernel/signal.c index 1666d3efb52e..b76bdfa473d6 100644 --- a/arch/sh64/kernel/signal.c +++ b/arch/sh64/kernel/signal.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
18 | #include <linux/smp.h> | 18 | #include <linux/smp.h> |
19 | #include <linux/smp_lock.h> | ||
20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
21 | #include <linux/signal.h> | 20 | #include <linux/signal.h> |
22 | #include <linux/errno.h> | 21 | #include <linux/errno.h> |
diff --git a/arch/sh64/kernel/sys_sh64.c b/arch/sh64/kernel/sys_sh64.c index ad0fa4e003e7..19126daf9f4c 100644 --- a/arch/sh64/kernel/sys_sh64.c +++ b/arch/sh64/kernel/sys_sh64.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
21 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
22 | #include <linux/smp.h> | 22 | #include <linux/smp.h> |
23 | #include <linux/smp_lock.h> | ||
24 | #include <linux/sem.h> | 23 | #include <linux/sem.h> |
25 | #include <linux/msg.h> | 24 | #include <linux/msg.h> |
26 | #include <linux/shm.h> | 25 | #include <linux/shm.h> |
diff --git a/arch/sh64/kernel/traps.c b/arch/sh64/kernel/traps.c index c346d7ef9280..9d0d58fb29fa 100644 --- a/arch/sh64/kernel/traps.c +++ b/arch/sh64/kernel/traps.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <linux/timer.h> | 23 | #include <linux/timer.h> |
24 | #include <linux/mm.h> | 24 | #include <linux/mm.h> |
25 | #include <linux/smp.h> | 25 | #include <linux/smp.h> |
26 | #include <linux/smp_lock.h> | ||
27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
28 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
29 | #include <linux/spinlock.h> | 28 | #include <linux/spinlock.h> |
diff --git a/arch/sh64/kernel/unwind.c b/arch/sh64/kernel/unwind.c index f934f97f9f9c..1214c78e3584 100644 --- a/arch/sh64/kernel/unwind.c +++ b/arch/sh64/kernel/unwind.c | |||
@@ -46,15 +46,15 @@ static int lookup_prev_stack_frame(unsigned long fp, unsigned long pc, | |||
46 | struct pt_regs *regs) | 46 | struct pt_regs *regs) |
47 | { | 47 | { |
48 | const char *sym; | 48 | const char *sym; |
49 | char *modname, namebuf[128]; | 49 | char namebuf[128]; |
50 | unsigned long offset, size; | 50 | unsigned long offset; |
51 | unsigned long prologue = 0; | 51 | unsigned long prologue = 0; |
52 | unsigned long fp_displacement = 0; | 52 | unsigned long fp_displacement = 0; |
53 | unsigned long fp_prev = 0; | 53 | unsigned long fp_prev = 0; |
54 | unsigned long offset_r14 = 0, offset_r18 = 0; | 54 | unsigned long offset_r14 = 0, offset_r18 = 0; |
55 | int i, found_prologue_end = 0; | 55 | int i, found_prologue_end = 0; |
56 | 56 | ||
57 | sym = kallsyms_lookup(pc, &size, &offset, &modname, namebuf); | 57 | sym = kallsyms_lookup(pc, NULL, &offset, NULL, namebuf); |
58 | if (!sym) | 58 | if (!sym) |
59 | return -EINVAL; | 59 | return -EINVAL; |
60 | 60 | ||
diff --git a/arch/sh64/kernel/vmlinux.lds.S b/arch/sh64/kernel/vmlinux.lds.S index a59c5e998131..4f9616f39830 100644 --- a/arch/sh64/kernel/vmlinux.lds.S +++ b/arch/sh64/kernel/vmlinux.lds.S | |||
@@ -85,7 +85,7 @@ SECTIONS | |||
85 | . = ALIGN(PAGE_SIZE); | 85 | . = ALIGN(PAGE_SIZE); |
86 | .data.page_aligned : C_PHYS(.data.page_aligned) { *(.data.page_aligned) } | 86 | .data.page_aligned : C_PHYS(.data.page_aligned) { *(.data.page_aligned) } |
87 | 87 | ||
88 | . = ALIGN(L1_CACHE_BYTES); | 88 | . = ALIGN(PAGE_SIZE); |
89 | __per_cpu_start = .; | 89 | __per_cpu_start = .; |
90 | .data.percpu : C_PHYS(.data.percpu) { *(.data.percpu) } | 90 | .data.percpu : C_PHYS(.data.percpu) { *(.data.percpu) } |
91 | __per_cpu_end = . ; | 91 | __per_cpu_end = . ; |
diff --git a/arch/sh64/mach-cayman/iomap.c b/arch/sh64/mach-cayman/iomap.c index 2d06e9a55137..a5c645f02d57 100644 --- a/arch/sh64/mach-cayman/iomap.c +++ b/arch/sh64/mach-cayman/iomap.c | |||
@@ -9,7 +9,6 @@ | |||
9 | * License. See the file "COPYING" in the main directory of this archive | 9 | * License. See the file "COPYING" in the main directory of this archive |
10 | * for more details. | 10 | * for more details. |
11 | */ | 11 | */ |
12 | #include <linux/pci.h> | ||
13 | #include <asm/io.h> | 12 | #include <asm/io.h> |
14 | #include <asm/cayman.h> | 13 | #include <asm/cayman.h> |
15 | 14 | ||
diff --git a/arch/sh64/mm/fault.c b/arch/sh64/mm/fault.c index 4f72ab33bb2b..4dd8ee8f01ce 100644 --- a/arch/sh64/mm/fault.c +++ b/arch/sh64/mm/fault.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/mman.h> | 22 | #include <linux/mman.h> |
23 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
24 | #include <linux/smp.h> | 24 | #include <linux/smp.h> |
25 | #include <linux/smp_lock.h> | ||
26 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
27 | 26 | ||
28 | #include <asm/system.h> | 27 | #include <asm/system.h> |
diff --git a/arch/sh64/mm/hugetlbpage.c b/arch/sh64/mm/hugetlbpage.c index 4b455f611146..fa66daa2dfa9 100644 --- a/arch/sh64/mm/hugetlbpage.c +++ b/arch/sh64/mm/hugetlbpage.c | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
14 | #include <linux/hugetlb.h> | 14 | #include <linux/hugetlb.h> |
15 | #include <linux/pagemap.h> | 15 | #include <linux/pagemap.h> |
16 | #include <linux/smp_lock.h> | ||
17 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
18 | #include <linux/sysctl.h> | 17 | #include <linux/sysctl.h> |
19 | 18 | ||
diff --git a/arch/sh64/mm/tlbmiss.c b/arch/sh64/mm/tlbmiss.c index c8615954aaa9..d4c5334186d0 100644 --- a/arch/sh64/mm/tlbmiss.c +++ b/arch/sh64/mm/tlbmiss.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <linux/mman.h> | 32 | #include <linux/mman.h> |
33 | #include <linux/mm.h> | 33 | #include <linux/mm.h> |
34 | #include <linux/smp.h> | 34 | #include <linux/smp.h> |
35 | #include <linux/smp_lock.h> | ||
36 | #include <linux/interrupt.h> | 35 | #include <linux/interrupt.h> |
37 | 36 | ||
38 | #include <asm/system.h> | 37 | #include <asm/system.h> |