diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-02-23 21:16:27 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-02-23 21:16:27 -0500 |
| commit | 7b0386921db20add25afd8678ed34a9253e512fc (patch) | |
| tree | 8c6b888b76211e38e6c1c3006553dc4b2b24c75e /arch/powerpc/kernel/head_64.S | |
| parent | c5580a7ecb859c6821dd761c95fa150ec7695ae1 (diff) | |
| parent | 22fe472cb430ce45c4fb9b6d13060dd724d6dbc8 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/powerpc/kernel/head_64.S')
| -rw-r--r-- | arch/powerpc/kernel/head_64.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S index 41565962939..2b03a09fe5e 100644 --- a/arch/powerpc/kernel/head_64.S +++ b/arch/powerpc/kernel/head_64.S @@ -157,8 +157,7 @@ _GLOBAL(__secondary_hold) SET_REG_IMMEDIATE(r4, .hmt_init) mtctr r4 bctr -#else -#ifdef CONFIG_SMP +#elif defined(CONFIG_SMP) || defined(CONFIG_KEXEC) LOAD_REG_IMMEDIATE(r4, .pSeries_secondary_smp_init) mtctr r4 mr r3,r24 @@ -166,7 +165,6 @@ _GLOBAL(__secondary_hold) #else BUG_OPCODE #endif -#endif /* This value is used to mark exception frames on the stack. */ .section ".toc","aw" |