diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-07-07 06:08:27 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-07-07 06:08:27 -0400 |
| commit | 717cb906bd43a9ac00631d600adda5c6546843a6 (patch) | |
| tree | f41b250e9e0fa1e664f002fa9c4608d94527f2f2 /arch/ppc/kernel/relocate_kernel.S | |
| parent | 22f579c621e2f264e6d093b07d75f99bc97d5df2 (diff) | |
| parent | c101f3136cc98a003d0d16be6fab7d0d950581a6 (diff) | |
Merge ../linux-2.6/
Diffstat (limited to 'arch/ppc/kernel/relocate_kernel.S')
| -rw-r--r-- | arch/ppc/kernel/relocate_kernel.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/kernel/relocate_kernel.S b/arch/ppc/kernel/relocate_kernel.S index 7ff69c4af920..9b2ad48e988c 100644 --- a/arch/ppc/kernel/relocate_kernel.S +++ b/arch/ppc/kernel/relocate_kernel.S | |||
| @@ -34,9 +34,9 @@ relocate_new_kernel: | |||
| 34 | 34 | ||
| 35 | mr r8, r0 | 35 | mr r8, r0 |
| 36 | ori r8, r8, MSR_RI|MSR_ME | 36 | ori r8, r8, MSR_RI|MSR_ME |
| 37 | mtspr SRR1, r8 | 37 | mtspr SPRN_SRR1, r8 |
| 38 | addi r8, r4, 1f - relocate_new_kernel | 38 | addi r8, r4, 1f - relocate_new_kernel |
| 39 | mtspr SRR0, r8 | 39 | mtspr SPRN_SRR0, r8 |
| 40 | sync | 40 | sync |
| 41 | rfi | 41 | rfi |
| 42 | 42 | ||