diff options
| author | Graf Yang <graf.yang@analog.com> | 2009-04-08 08:30:22 (GMT) |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-06-12 10:03:44 (GMT) |
| commit | f82e0a0c67621df83458753aef580a3508d5428e (patch) | |
| tree | cf49028f91c2631c7fa3cb6eae73fb3f66d7d885 /arch/blackfin/mm | |
| parent | b8d0c778e652d23750cb1af9848408d620cbc425 (diff) | |
| download | linux-f82e0a0c67621df83458753aef580a3508d5428e.tar.xz | |
Blackfin: fix link failure due to CONFIG_EXCEPTION_L1_SCRATCH
Move exception stack mess from entry.S to init.c to fix link failure when
CONFIG_EXCEPTION_L1_SCRATCH is in use.
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin/mm')
| -rw-r--r-- | arch/blackfin/mm/init.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/blackfin/mm/init.c b/arch/blackfin/mm/init.c index 9c3629b..00543c8 100644 --- a/arch/blackfin/mm/init.c +++ b/arch/blackfin/mm/init.c @@ -52,9 +52,14 @@ static unsigned long empty_bad_page_table; static unsigned long empty_bad_page; -unsigned long empty_zero_page; +static unsigned long empty_zero_page; -extern unsigned long exception_stack[NR_CPUS][1024]; +#ifndef CONFIG_EXCEPTION_L1_SCRATCH +#if defined CONFIG_SYSCALL_TAB_L1 +__attribute__((l1_data)) +#endif +static unsigned long exception_stack[NR_CPUS][1024]; +#endif struct blackfin_pda cpu_pda[NR_CPUS]; EXPORT_SYMBOL(cpu_pda); @@ -117,7 +122,12 @@ asmlinkage void __init init_pda(void) cpu_pda[0].next = &cpu_pda[1]; cpu_pda[1].next = &cpu_pda[0]; +#ifdef CONFIG_EXCEPTION_L1_SCRATCH + cpu_pda[cpu].ex_stack = (unsigned long *)(L1_SCRATCH_START + \ + L1_SCRATCH_LENGTH); +#else cpu_pda[cpu].ex_stack = exception_stack[cpu + 1]; +#endif #ifdef CONFIG_SMP cpu_pda[cpu].imask = 0x1f; |