aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/kernel/head_64.S
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-06 14:38:16 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-06 14:38:16 -0500
commit74f5ec29ae93aa42c49f4285c20c457afe937881 (patch)
tree2f9fe3e3f7bcd91769b0030cead82e1986e0dd32 /arch/powerpc/kernel/head_64.S
parentad8c48ad3bbef078616ed4d2652d362dfd962f09 (diff)
parent2d66806d740eeb410aa785bd7fba3bd24bb082c1 (diff)
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/powerpc/kernel/head_64.S')
-rw-r--r--arch/powerpc/kernel/head_64.S3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 11f2cd5af7d..9b65029dd2a 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -1537,6 +1537,9 @@ _STATIC(__boot_from_prom)
mr r28,r6
mr r27,r7
+ /* Align the stack to 16-byte boundary for broken yaboot */
+ rldicr r1,r1,0,59
+
/* Make sure we are running in 64 bits mode */
bl .enable_64b_mode