diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-04 03:07:19 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-04 03:07:19 -0500 |
| commit | b8307db2477f9c551e54e0c7b643ea349a3349cd (patch) | |
| tree | 88654f8bd73857bbd40f75013ce41d8882d16ce6 /arch/sparc/kernel/trampoline.S | |
| parent | f0461d0146ee30927bc7efa2ae24ea8c6693b725 (diff) | |
| parent | 061e41fdb5047b1fb161e89664057835935ca1d2 (diff) | |
Merge commit 'v2.6.28-rc7' into tracing/core
Diffstat (limited to 'arch/sparc/kernel/trampoline.S')
| -rw-r--r-- | arch/sparc/kernel/trampoline.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/trampoline.S b/arch/sparc/kernel/trampoline.S index 356c56aebc62..5e235c52d667 100644 --- a/arch/sparc/kernel/trampoline.S +++ b/arch/sparc/kernel/trampoline.S | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | .globl sun4m_cpu_startup, __smp4m_processor_id | 18 | .globl sun4m_cpu_startup, __smp4m_processor_id |
| 19 | .globl sun4d_cpu_startup, __smp4d_processor_id | 19 | .globl sun4d_cpu_startup, __smp4d_processor_id |
| 20 | 20 | ||
| 21 | __INIT | 21 | __CPUINIT |
| 22 | .align 4 | 22 | .align 4 |
| 23 | 23 | ||
| 24 | /* When we start up a cpu for the first time it enters this routine. | 24 | /* When we start up a cpu for the first time it enters this routine. |
| @@ -109,7 +109,7 @@ __smp4d_processor_id: | |||
| 109 | /* CPUID in bootbus can be found at PA 0xff0140000 */ | 109 | /* CPUID in bootbus can be found at PA 0xff0140000 */ |
| 110 | #define SUN4D_BOOTBUS_CPUID 0xf0140000 | 110 | #define SUN4D_BOOTBUS_CPUID 0xf0140000 |
| 111 | 111 | ||
| 112 | __INIT | 112 | __CPUINIT |
| 113 | .align 4 | 113 | .align 4 |
| 114 | 114 | ||
| 115 | sun4d_cpu_startup: | 115 | sun4d_cpu_startup: |