diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-12 15:23:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-12 15:23:51 -0400 |
| commit | c87ce65868bbf9bbea9c3f112ff8315302daf8f2 (patch) | |
| tree | dc4a038bf888bd78b75a23e120c7fa737960fedf /arch/ppc/kernel/head_8xx.S | |
| parent | c413fecc763e380ec93dc6faf726e7e735ade04e (diff) | |
| parent | ee56c47440ab04c6a35c835a9bcc4193304adf93 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Move serial_dev_init to device_initcall()
[POWERPC] Enable GENERIC_ISA_DMA if FSL_ULI1575 to fix compile issue
[POWERPC] cpm2: Fix off-by-one error in setbrg().
[PPC] 8xx: Fix r3 trashing due to 8MB TLB page instantiation
[POWERPC] 8{5,6}xx: Fix build issue with !CONFIG_PCI
Diffstat (limited to 'arch/ppc/kernel/head_8xx.S')
| -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 |