diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-20 12:47:40 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-20 12:47:40 -0500 |
| commit | 9a21247181d93fdf99255911845ecdb041d21583 (patch) | |
| tree | 6d69be36f8a2bd8c76bf02ead2f0121a511c0a92 /arch/powerpc/kernel/head_64.S | |
| parent | c752666c17f870fa8ae9f16804dd457e9e6daaec (diff) | |
| parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/powerpc/kernel/head_64.S')
| -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 | ||