diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-02 14:09:50 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-02 14:09:50 -0500 |
| commit | a64d31baed104be25305e9c71585d3ea4ee9a418 (patch) | |
| tree | 470e3c59ef39f38bcd69f8fef7dba8f76afbec53 /arch/alpha/kernel/traps.c | |
| parent | 1c39194878c09bd88ffc9c9d4c2f01c3397c7aed (diff) | |
| parent | 061e41fdb5047b1fb161e89664057835935ca1d2 (diff) | |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/trace/ring_buffer.c
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 @@ | |||
| 31 | 31 | ||
| 32 | static int opDEC_fix; | 32 | static int opDEC_fix; |
| 33 | 33 | ||
| 34 | static void __init | 34 | static void __cpuinit |
| 35 | opDEC_check(void) | 35 | opDEC_check(void) |
| 36 | { | 36 | { |
| 37 | __asm__ __volatile__ ( | 37 | __asm__ __volatile__ ( |
| @@ -1072,7 +1072,7 @@ give_sigbus: | |||
| 1072 | return; | 1072 | return; |
| 1073 | } | 1073 | } |
| 1074 | 1074 | ||
| 1075 | void __init | 1075 | void __cpuinit |
| 1076 | trap_init(void) | 1076 | trap_init(void) |
| 1077 | { | 1077 | { |
| 1078 | /* Tell PAL-code what global pointer we want in the kernel. */ | 1078 | /* Tell PAL-code what global pointer we want in the kernel. */ |