aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-06 14:37:47 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-06 14:37:47 -0500
commitd033d9345101c07aa6965590109eac0bf7f25b8d (patch)
tree280205c395791ba2316ab3940aed953f89ee7f38 /arch
parenta7a80d5ad3735554338199b9d976dfda5c10d3c7 (diff)
parent501f74f29498543c27f4f9697f5c1e980dd2de0d (diff)
downloadkernel_samsung_crespo-d033d9345101c07aa6965590109eac0bf7f25b8d.zip
kernel_samsung_crespo-d033d9345101c07aa6965590109eac0bf7f25b8d.tar.gz
kernel_samsung_crespo-d033d9345101c07aa6965590109eac0bf7f25b8d.tar.bz2
Merge branch 'master'
Diffstat (limited to 'arch')
-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 11f2cd5..9b65029 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