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/hvtramp.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/hvtramp.S')
-rw-r--r-- | arch/sparc64/kernel/hvtramp.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/hvtramp.S b/arch/sparc64/kernel/hvtramp.S index b692e044a463..0236c43772fa 100644 --- a/arch/sparc64/kernel/hvtramp.S +++ b/arch/sparc64/kernel/hvtramp.S | |||
@@ -3,6 +3,8 @@ | |||
3 | * Copyright (C) 2007 David S. Miller <davem@davemloft.net> | 3 | * Copyright (C) 2007 David S. Miller <davem@davemloft.net> |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include <linux/init.h> | ||
7 | |||
6 | #include <asm/thread_info.h> | 8 | #include <asm/thread_info.h> |
7 | #include <asm/hypervisor.h> | 9 | #include <asm/hypervisor.h> |
8 | #include <asm/scratchpad.h> | 10 | #include <asm/scratchpad.h> |
@@ -13,7 +15,7 @@ | |||
13 | #include <asm/head.h> | 15 | #include <asm/head.h> |
14 | #include <asm/asi.h> | 16 | #include <asm/asi.h> |
15 | 17 | ||
16 | .text | 18 | __CPUINIT |
17 | .align 8 | 19 | .align 8 |
18 | .globl hv_cpu_startup, hv_cpu_startup_end | 20 | .globl hv_cpu_startup, hv_cpu_startup_end |
19 | 21 | ||