diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
| commit | 516450179454de9e689e0a53ed8f34b896e8651c (patch) | |
| tree | 78eae2f77de6cd39b18c7393fc5854456fc3fb1f /arch/powerpc/kernel/head_64.S | |
| parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
| parent | 0d514f040ac6629311974889d5b96bcf21c6461a (diff) | |
Merge ../linux-2.6
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 be3ae7733577..35084f3a841b 100644 --- a/arch/powerpc/kernel/head_64.S +++ b/arch/powerpc/kernel/head_64.S | |||
| @@ -1544,6 +1544,9 @@ _STATIC(__boot_from_prom) | |||
| 1544 | mr r28,r6 | 1544 | mr r28,r6 |
| 1545 | mr r27,r7 | 1545 | mr r27,r7 |
| 1546 | 1546 | ||
| 1547 | /* Align the stack to 16-byte boundary for broken yaboot */ | ||
| 1548 | rldicr r1,r1,0,59 | ||
| 1549 | |||
| 1547 | /* Make sure we are running in 64 bits mode */ | 1550 | /* Make sure we are running in 64 bits mode */ |
| 1548 | bl .enable_64b_mode | 1551 | bl .enable_64b_mode |
| 1549 | 1552 | ||