summaryrefslogtreecommitdiffstats
path: root/arch/ppc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-07 20:32:13 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-07 20:32:13 -0800
commitfe69102188cde0700cddd8d4cda0b77d68284884 (patch)
treeae2f88c810ff48f040a808a924585000b52082e9 /arch/ppc
parentf30ac319f1b91878cdc57a50930f15c36e0e103a (diff)
parent7d4d61544a12333600bdb9b018a149868418692e (diff)
downloadlinux-fe69102188cde0700cddd8d4cda0b77d68284884.tar.gz
linux-fe69102188cde0700cddd8d4cda0b77d68284884.tar.bz2
linux-fe69102188cde0700cddd8d4cda0b77d68284884.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/kernel/head_8xx.S7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/ppc/kernel/head_8xx.S b/arch/ppc/kernel/head_8xx.S
index 3e6ca7f5843f..c1e89ad0684d 100644
--- a/arch/ppc/kernel/head_8xx.S
+++ b/arch/ppc/kernel/head_8xx.S
@@ -810,13 +810,16 @@ initial_mmu:
mtspr SPRN_MD_TWC, r9
li r11, MI_BOOTINIT /* Create RPN for address 0 */
addis r11, r11, 0x0080 /* Add 8M */
- mtspr SPRN_MD_RPN, r8
+ mtspr SPRN_MD_RPN, r11
+
+ addi r10, r10, 0x0100
+ mtspr SPRN_MD_CTR, r10
addis r8, r8, 0x0080 /* Add 8M */
mtspr SPRN_MD_EPN, r8
mtspr SPRN_MD_TWC, r9
addis r11, r11, 0x0080 /* Add 8M */
- mtspr SPRN_MD_RPN, r8
+ mtspr SPRN_MD_RPN, r11
#endif
/* Since the cache is enabled according to the information we