diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
| commit | b2315372eac9cd9f622c32a93e323cf6f0f03462 (patch) | |
| tree | 9e1faa7cdcddf5d90bec4fb9523742d4cce699a1 /arch/ppc | |
| parent | 5326152fa182b0a16e4abf913ce403e3c7ab53b7 (diff) | |
| parent | c87ce65868bbf9bbea9c3f112ff8315302daf8f2 (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/kernel/head_8xx.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ppc/kernel/head_8xx.S b/arch/ppc/kernel/head_8xx.S index 944c35c24278..eb8d26f87362 100644 --- a/arch/ppc/kernel/head_8xx.S +++ b/arch/ppc/kernel/head_8xx.S | |||
| @@ -495,9 +495,7 @@ LoadLargeDTLB: | |||
| 495 | lwz r11, 4(r0) | 495 | lwz r11, 4(r0) |
| 496 | 496 | ||
| 497 | lwz r12, 16(r0) | 497 | lwz r12, 16(r0) |
| 498 | #ifdef CONFIG_8xx_CPU6 | ||
| 499 | lwz r3, 8(r0) | 498 | lwz r3, 8(r0) |
| 500 | #endif | ||
| 501 | rfi | 499 | rfi |
| 502 | 500 | ||
| 503 | /* This is the data TLB error on the MPC8xx. This could be due to | 501 | /* This is the data TLB error on the MPC8xx. This could be due to |