diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2008-03-08 04:56:28 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-03-12 10:14:41 -0400 |
commit | 234fcd1484a66158b561b36b421547f0ab85fee9 (patch) | |
tree | b63fbb134fd673e1713f0462e6e0642b418da616 /arch/mips/kernel/traps.c | |
parent | 1af0eea21431bed5d07dffc0fefab57fd72f7e90 (diff) |
[MIPS] Fix loads of section missmatches
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel/traps.c')
-rw-r--r-- | arch/mips/kernel/traps.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 79cf7e913b99..984c0d0a7b4d 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c | |||
@@ -1306,7 +1306,7 @@ int cp0_compare_irq; | |||
1306 | int cp0_perfcount_irq; | 1306 | int cp0_perfcount_irq; |
1307 | EXPORT_SYMBOL_GPL(cp0_perfcount_irq); | 1307 | EXPORT_SYMBOL_GPL(cp0_perfcount_irq); |
1308 | 1308 | ||
1309 | void __init per_cpu_trap_init(void) | 1309 | void __cpuinit per_cpu_trap_init(void) |
1310 | { | 1310 | { |
1311 | unsigned int cpu = smp_processor_id(); | 1311 | unsigned int cpu = smp_processor_id(); |
1312 | unsigned int status_set = ST0_CU0; | 1312 | unsigned int status_set = ST0_CU0; |
@@ -1423,11 +1423,12 @@ void __init set_handler(unsigned long offset, void *addr, unsigned long size) | |||
1423 | flush_icache_range(ebase + offset, ebase + offset + size); | 1423 | flush_icache_range(ebase + offset, ebase + offset + size); |
1424 | } | 1424 | } |
1425 | 1425 | ||
1426 | static char panic_null_cerr[] __initdata = | 1426 | static char panic_null_cerr[] __cpuinitdata = |
1427 | "Trying to set NULL cache error exception handler"; | 1427 | "Trying to set NULL cache error exception handler"; |
1428 | 1428 | ||
1429 | /* Install uncached CPU exception handler */ | 1429 | /* Install uncached CPU exception handler */ |
1430 | void __init set_uncached_handler(unsigned long offset, void *addr, unsigned long size) | 1430 | void __cpuinit set_uncached_handler(unsigned long offset, void *addr, |
1431 | unsigned long size) | ||
1431 | { | 1432 | { |
1432 | #ifdef CONFIG_32BIT | 1433 | #ifdef CONFIG_32BIT |
1433 | unsigned long uncached_ebase = KSEG1ADDR(ebase); | 1434 | unsigned long uncached_ebase = KSEG1ADDR(ebase); |