diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-13 10:12:51 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-13 10:12:51 +0100 |
| commit | 72aaf09fda49f5919d98d65d35e5179f3acb0497 (patch) | |
| tree | 5fd25748f7f5640f8ee8efb86ddca88d12840791 /arch/alpha/kernel/traps.c | |
| parent | [ARM] fix xm_x2xx_defconfig build errors (diff) | |
| parent | [ARM] Kirkwood: update defconfig (diff) | |
| download | linux-72aaf09fda49f5919d98d65d35e5179f3acb0497.tar.xz linux-72aaf09fda49f5919d98d65d35e5179f3acb0497.zip | |
Merge git://git.marvell.com/orion into devel
Diffstat (limited to 'arch/alpha/kernel/traps.c')
| -rw-r--r-- | arch/alpha/kernel/traps.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c index c778779007fc..cefc5a355ef9 100644 --- a/arch/alpha/kernel/traps.c +++ b/arch/alpha/kernel/traps.c @@ -31,7 +31,7 @@ static int opDEC_fix; -static void __init +static void __cpuinit opDEC_check(void) { __asm__ __volatile__ ( @@ -1072,7 +1072,7 @@ give_sigbus: return; } -void __init +void __cpuinit trap_init(void) { /* Tell PAL-code what global pointer we want in the kernel. */ |