diff options
| author | Artem B. Bityuckiy <dedekind@infradead.org> | 2005-07-06 10:43:18 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-06 13:40:38 -0400 |
| commit | b3539219c9ea20ebf6a5ea3cc534f423a3607c41 (patch) | |
| tree | d17c31c0eac0a7290ba5011b59a100fd9e9c9532 /arch/ppc/kernel/relocate_kernel.S | |
| parent | 6430a8def12edebc1c9c7c2621d33ca0e8653c33 (diff) | |
| parent | a18bcb7450840f07a772a45229de4811d930f461 (diff) | |
Merge with rsync://fileserver/linux
Update to 2.6.12-rc3
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 | ||