diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-06 14:38:16 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-06 14:38:16 -0500 |
| commit | 74f5ec29ae93aa42c49f4285c20c457afe937881 (patch) | |
| tree | 2f9fe3e3f7bcd91769b0030cead82e1986e0dd32 /arch/powerpc/kernel | |
| parent | ad8c48ad3bbef078616ed4d2652d362dfd962f09 (diff) | |
| parent | 2d66806d740eeb410aa785bd7fba3bd24bb082c1 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/head_64.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S index 11f2cd5af7dc..9b65029dd2a3 100644 --- a/arch/powerpc/kernel/head_64.S +++ b/arch/powerpc/kernel/head_64.S | |||
| @@ -1537,6 +1537,9 @@ _STATIC(__boot_from_prom) | |||
| 1537 | mr r28,r6 | 1537 | mr r28,r6 |
| 1538 | mr r27,r7 | 1538 | mr r27,r7 |
| 1539 | 1539 | ||
| 1540 | /* Align the stack to 16-byte boundary for broken yaboot */ | ||
| 1541 | rldicr r1,r1,0,59 | ||
| 1542 | |||
| 1540 | /* Make sure we are running in 64 bits mode */ | 1543 | /* Make sure we are running in 64 bits mode */ |
| 1541 | bl .enable_64b_mode | 1544 | bl .enable_64b_mode |
| 1542 | 1545 | ||