diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/blackfin/Kconfig | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-common/entry.S | 17 | ||||
-rw-r--r-- | arch/blackfin/mm/init.c | 14 |
3 files changed, 13 insertions, 20 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 6b97aa811e2b..672b7b056c8e 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
@@ -808,7 +808,7 @@ config APP_STACK_L1 | |||
808 | config EXCEPTION_L1_SCRATCH | 808 | config EXCEPTION_L1_SCRATCH |
809 | bool "Locate exception stack in L1 Scratch Memory" | 809 | bool "Locate exception stack in L1 Scratch Memory" |
810 | default n | 810 | default n |
811 | depends on !APP_STACK_L1 && !SYSCALL_TAB_L1 | 811 | depends on !APP_STACK_L1 |
812 | help | 812 | help |
813 | Whenever an exception occurs, use the L1 Scratch memory for | 813 | Whenever an exception occurs, use the L1 Scratch memory for |
814 | stack storage. You cannot place the stacks of FLAT binaries | 814 | stack storage. You cannot place the stacks of FLAT binaries |
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S index a063a434f7e3..f0636fdcb353 100644 --- a/arch/blackfin/mach-common/entry.S +++ b/arch/blackfin/mach-common/entry.S | |||
@@ -36,7 +36,6 @@ | |||
36 | #include <linux/init.h> | 36 | #include <linux/init.h> |
37 | #include <linux/linkage.h> | 37 | #include <linux/linkage.h> |
38 | #include <linux/unistd.h> | 38 | #include <linux/unistd.h> |
39 | #include <linux/threads.h> | ||
40 | #include <asm/blackfin.h> | 39 | #include <asm/blackfin.h> |
41 | #include <asm/errno.h> | 40 | #include <asm/errno.h> |
42 | #include <asm/fixed_code.h> | 41 | #include <asm/fixed_code.h> |
@@ -1588,19 +1587,3 @@ ENTRY(_sys_call_table) | |||
1588 | .long _sys_ni_syscall | 1587 | .long _sys_ni_syscall |
1589 | .endr | 1588 | .endr |
1590 | END(_sys_call_table) | 1589 | END(_sys_call_table) |
1591 | |||
1592 | #ifdef CONFIG_EXCEPTION_L1_SCRATCH | ||
1593 | /* .section .l1.bss.scratch */ | ||
1594 | .set _exception_stack_top, L1_SCRATCH_START + L1_SCRATCH_LENGTH | ||
1595 | #else | ||
1596 | #ifdef CONFIG_SYSCALL_TAB_L1 | ||
1597 | .section .l1.bss | ||
1598 | #else | ||
1599 | .bss | ||
1600 | #endif | ||
1601 | ENTRY(_exception_stack) | ||
1602 | .rept 1024 * NR_CPUS | ||
1603 | .long 0 | ||
1604 | .endr | ||
1605 | _exception_stack_top: | ||
1606 | #endif | ||
diff --git a/arch/blackfin/mm/init.c b/arch/blackfin/mm/init.c index 9c3629b9a689..00543c813f4a 100644 --- a/arch/blackfin/mm/init.c +++ b/arch/blackfin/mm/init.c | |||
@@ -52,9 +52,14 @@ static unsigned long empty_bad_page_table; | |||
52 | 52 | ||
53 | static unsigned long empty_bad_page; | 53 | static unsigned long empty_bad_page; |
54 | 54 | ||
55 | unsigned long empty_zero_page; | 55 | static unsigned long empty_zero_page; |
56 | 56 | ||
57 | extern unsigned long exception_stack[NR_CPUS][1024]; | 57 | #ifndef CONFIG_EXCEPTION_L1_SCRATCH |
58 | #if defined CONFIG_SYSCALL_TAB_L1 | ||
59 | __attribute__((l1_data)) | ||
60 | #endif | ||
61 | static unsigned long exception_stack[NR_CPUS][1024]; | ||
62 | #endif | ||
58 | 63 | ||
59 | struct blackfin_pda cpu_pda[NR_CPUS]; | 64 | struct blackfin_pda cpu_pda[NR_CPUS]; |
60 | EXPORT_SYMBOL(cpu_pda); | 65 | EXPORT_SYMBOL(cpu_pda); |
@@ -117,7 +122,12 @@ asmlinkage void __init init_pda(void) | |||
117 | cpu_pda[0].next = &cpu_pda[1]; | 122 | cpu_pda[0].next = &cpu_pda[1]; |
118 | cpu_pda[1].next = &cpu_pda[0]; | 123 | cpu_pda[1].next = &cpu_pda[0]; |
119 | 124 | ||
125 | #ifdef CONFIG_EXCEPTION_L1_SCRATCH | ||
126 | cpu_pda[cpu].ex_stack = (unsigned long *)(L1_SCRATCH_START + \ | ||
127 | L1_SCRATCH_LENGTH); | ||
128 | #else | ||
120 | cpu_pda[cpu].ex_stack = exception_stack[cpu + 1]; | 129 | cpu_pda[cpu].ex_stack = exception_stack[cpu + 1]; |
130 | #endif | ||
121 | 131 | ||
122 | #ifdef CONFIG_SMP | 132 | #ifdef CONFIG_SMP |
123 | cpu_pda[cpu].imask = 0x1f; | 133 | cpu_pda[cpu].imask = 0x1f; |