diff options
author | 2008-06-30 10:16:50 +1000 | |
---|---|---|
committer | 2008-06-30 10:16:50 +1000 | |
commit | e9a4b6a3f6592862a67837e80aad3f50468857a6 (patch) | |
tree | 087420cf91ac922c7e99757c4490a605ec7b10f2 /arch/powerpc/kernel/head_44x.S | |
parent | Merge branch 'next' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/po... (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb (diff) | |
download | linux-e9a4b6a3f6592862a67837e80aad3f50468857a6.tar.gz linux-e9a4b6a3f6592862a67837e80aad3f50468857a6.tar.bz2 linux-e9a4b6a3f6592862a67837e80aad3f50468857a6.zip |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/powerpc/kernel/head_44x.S')
-rw-r--r-- | arch/powerpc/kernel/head_44x.S | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S index 47ea8affad23..2944529e8bf9 100644 --- a/arch/powerpc/kernel/head_44x.S +++ b/arch/powerpc/kernel/head_44x.S @@ -368,7 +368,12 @@ interrupt_base: rlwimi r11,r13,0,26,31 /* Insert static perms */ - rlwinm r11,r11,0,20,15 /* Clear U0-U3 */ + /* + * Clear U0-U3 and WL1 IL1I IL1D IL2I IL2D bits which are added + * on newer 440 cores like the 440x6 used on AMCC 460EX/460GT (see + * include/asm-powerpc/pgtable-ppc32.h for details). + */ + rlwinm r11,r11,0,20,10 /* find the TLB index that caused the fault. It has to be here. */ tlbsx r10, 0, r10 |