diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2008-02-21 01:22:16 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-21 01:22:16 -0500 |
commit | 0f7f22d9a46261e310b32c61eb11977a7cc83f7b (patch) | |
tree | 7c1028ed7386844ca97be925c1c9f6b43bca411a /arch/sparc64/kernel/trampoline.S | |
parent | b1422401f2491ecb7579c8d241e1f924b35e6b67 (diff) |
[SPARC64]: Fix cpu trampoline et al. mismatch warnings.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/trampoline.S')
-rw-r--r-- | arch/sparc64/kernel/trampoline.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/trampoline.S b/arch/sparc64/kernel/trampoline.S index 04e81dda13d0..4ae2e525d68b 100644 --- a/arch/sparc64/kernel/trampoline.S +++ b/arch/sparc64/kernel/trampoline.S | |||
@@ -4,6 +4,8 @@ | |||
4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include <linux/init.h> | ||
8 | |||
7 | #include <asm/head.h> | 9 | #include <asm/head.h> |
8 | #include <asm/asi.h> | 10 | #include <asm/asi.h> |
9 | #include <asm/lsu.h> | 11 | #include <asm/lsu.h> |
@@ -36,7 +38,7 @@ dtlb_load: | |||
36 | tramp_stack: | 38 | tramp_stack: |
37 | .skip TRAMP_STACK_SIZE | 39 | .skip TRAMP_STACK_SIZE |
38 | 40 | ||
39 | .text | 41 | __CPUINIT |
40 | .align 8 | 42 | .align 8 |
41 | .globl sparc64_cpu_startup, sparc64_cpu_startup_end | 43 | .globl sparc64_cpu_startup, sparc64_cpu_startup_end |
42 | sparc64_cpu_startup: | 44 | sparc64_cpu_startup: |