diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-03 05:31:09 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-03 05:31:09 -0500 |
| commit | 3cecdda3f169f22f324f78fd544beee68e3cc6a4 (patch) | |
| tree | e7c2995ddc2690d1be695a1525bcd16d3965548d /arch/sparc64/kernel/trampoline.S | |
| parent | b9c64498f53e0f4d90eec03048f73ac215bb6f79 (diff) | |
| parent | da40451bba23b51eaca4170a095891646ce72104 (diff) | |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6 into merge
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: |