diff options
Diffstat (limited to 'arch/sh/kernel')
-rw-r--r-- | arch/sh/kernel/head.S | 4 | ||||
-rw-r--r-- | arch/sh/kernel/irq.c | 17 | ||||
-rw-r--r-- | arch/sh/kernel/vmlinux.lds.S | 14 |
3 files changed, 27 insertions, 8 deletions
diff --git a/arch/sh/kernel/head.S b/arch/sh/kernel/head.S index c5e363872b91..3e7d00b7985a 100644 --- a/arch/sh/kernel/head.S +++ b/arch/sh/kernel/head.S | |||
@@ -11,6 +11,8 @@ | |||
11 | * Head.S contains the SH exception handlers and startup code. | 11 | * Head.S contains the SH exception handlers and startup code. |
12 | */ | 12 | */ |
13 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
14 | #include <asm/thread_info.h> | ||
15 | #include <asm/page.h> | ||
14 | 16 | ||
15 | #ifdef CONFIG_CPU_SH4A | 17 | #ifdef CONFIG_CPU_SH4A |
16 | #define SYNCO() synco | 18 | #define SYNCO() synco |
@@ -95,7 +97,7 @@ ENTRY(_stext) | |||
95 | 97 | ||
96 | .balign 4 | 98 | .balign 4 |
97 | 1: .long 0x400080F0 ! MD=1, RB=0, BL=0, FD=1, IMASK=0xF | 99 | 1: .long 0x400080F0 ! MD=1, RB=0, BL=0, FD=1, IMASK=0xF |
98 | 2: .long init_thread_union+8192 | 100 | 2: .long init_thread_union+THREAD_SIZE |
99 | 3: .long __bss_start | 101 | 3: .long __bss_start |
100 | 4: .long _end | 102 | 4: .long _end |
101 | 5: .long start_kernel | 103 | 5: .long start_kernel |
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c index c2e07f7f3496..7066611aeb72 100644 --- a/arch/sh/kernel/irq.c +++ b/arch/sh/kernel/irq.c | |||
@@ -60,7 +60,6 @@ unlock: | |||
60 | } | 60 | } |
61 | #endif | 61 | #endif |
62 | 62 | ||
63 | |||
64 | asmlinkage int do_IRQ(unsigned long r4, unsigned long r5, | 63 | asmlinkage int do_IRQ(unsigned long r4, unsigned long r5, |
65 | unsigned long r6, unsigned long r7, | 64 | unsigned long r6, unsigned long r7, |
66 | struct pt_regs regs) | 65 | struct pt_regs regs) |
@@ -69,6 +68,22 @@ asmlinkage int do_IRQ(unsigned long r4, unsigned long r5, | |||
69 | 68 | ||
70 | irq_enter(); | 69 | irq_enter(); |
71 | 70 | ||
71 | #ifdef CONFIG_DEBUG_STACKOVERFLOW | ||
72 | /* Debugging check for stack overflow: is there less than 1KB free? */ | ||
73 | { | ||
74 | long sp; | ||
75 | |||
76 | __asm__ __volatile__ ("and r15, %0" : | ||
77 | "=r" (sp) : "0" (THREAD_SIZE - 1)); | ||
78 | |||
79 | if (unlikely(sp < (sizeof(struct thread_info) + STACK_WARN))) { | ||
80 | printk("do_IRQ: stack overflow: %ld\n", | ||
81 | sp - sizeof(struct thread_info)); | ||
82 | dump_stack(); | ||
83 | } | ||
84 | } | ||
85 | #endif | ||
86 | |||
72 | #ifdef CONFIG_CPU_HAS_INTEVT | 87 | #ifdef CONFIG_CPU_HAS_INTEVT |
73 | __asm__ __volatile__ ( | 88 | __asm__ __volatile__ ( |
74 | #ifdef CONFIG_CPU_HAS_SR_RB | 89 | #ifdef CONFIG_CPU_HAS_SR_RB |
diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S index eb860c51c697..0220d8a838a7 100644 --- a/arch/sh/kernel/vmlinux.lds.S +++ b/arch/sh/kernel/vmlinux.lds.S | |||
@@ -2,6 +2,8 @@ | |||
2 | * ld script to make SuperH Linux kernel | 2 | * ld script to make SuperH Linux kernel |
3 | * Written by Niibe Yutaka | 3 | * Written by Niibe Yutaka |
4 | */ | 4 | */ |
5 | #include <asm/thread_info.h> | ||
6 | #include <asm/page.h> | ||
5 | #include <asm-generic/vmlinux.lds.h> | 7 | #include <asm-generic/vmlinux.lds.h> |
6 | 8 | ||
7 | #ifdef CONFIG_CPU_LITTLE_ENDIAN | 9 | #ifdef CONFIG_CPU_LITTLE_ENDIAN |
@@ -40,16 +42,16 @@ SECTIONS | |||
40 | *(.data) | 42 | *(.data) |
41 | 43 | ||
42 | /* Align the initial ramdisk image (INITRD) on page boundaries. */ | 44 | /* Align the initial ramdisk image (INITRD) on page boundaries. */ |
43 | . = ALIGN(4096); | 45 | . = ALIGN(PAGE_SIZE); |
44 | __rd_start = .; | 46 | __rd_start = .; |
45 | *(.initrd) | 47 | *(.initrd) |
46 | . = ALIGN(4096); | 48 | . = ALIGN(PAGE_SIZE); |
47 | __rd_end = .; | 49 | __rd_end = .; |
48 | 50 | ||
49 | CONSTRUCTORS | 51 | CONSTRUCTORS |
50 | } | 52 | } |
51 | 53 | ||
52 | . = ALIGN(4096); | 54 | . = ALIGN(PAGE_SIZE); |
53 | .data.page_aligned : { *(.data.idt) } | 55 | .data.page_aligned : { *(.data.idt) } |
54 | 56 | ||
55 | . = ALIGN(32); | 57 | . = ALIGN(32); |
@@ -60,10 +62,10 @@ SECTIONS | |||
60 | 62 | ||
61 | _edata = .; /* End of data section */ | 63 | _edata = .; /* End of data section */ |
62 | 64 | ||
63 | . = ALIGN(8192); /* init_task */ | 65 | . = ALIGN(THREAD_SIZE); /* init_task */ |
64 | .data.init_task : { *(.data.init_task) } | 66 | .data.init_task : { *(.data.init_task) } |
65 | 67 | ||
66 | . = ALIGN(4096); /* Init code and data */ | 68 | . = ALIGN(PAGE_SIZE); /* Init code and data */ |
67 | __init_begin = .; | 69 | __init_begin = .; |
68 | _sinittext = .; | 70 | _sinittext = .; |
69 | .init.text : { *(.init.text) } | 71 | .init.text : { *(.init.text) } |
@@ -94,7 +96,7 @@ SECTIONS | |||
94 | __machvec_start = .; | 96 | __machvec_start = .; |
95 | .init.machvec : { *(.init.machvec) } | 97 | .init.machvec : { *(.init.machvec) } |
96 | __machvec_end = .; | 98 | __machvec_end = .; |
97 | . = ALIGN(4096); | 99 | . = ALIGN(PAGE_SIZE); |
98 | __init_end = .; | 100 | __init_end = .; |
99 | 101 | ||
100 | . = ALIGN(4); | 102 | . = ALIGN(4); |