Skip to content

Commit

Permalink
[PPC] 8xx: Fix r3 trashing due to 8MB TLB page instantiation
Browse files Browse the repository at this point in the history
Instantiation of 8MB pages on the TLB cache for the kernel static
mapping trashes r3 register on !CONFIG_8xx_CPU6 configurations.
This ensures r3 gets saved and restored.

This has been posted to linuxppc-embedded by Marcelo Tosatti
<marcelo@kvack.org>, but only an incomplete version of the patch
has been applied in c51e078.
This patch adds the rest of the fix.

Signed-off-by: Jochen Friedrich <jochen@scram.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
  • Loading branch information
Jochen Friedrich authored and Kumar Gala committed Sep 10, 2007
1 parent 2af8569 commit 36c50f7
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions arch/ppc/kernel/head_8xx.S
Original file line number Diff line number Diff line change
Expand Up @@ -495,9 +495,7 @@ LoadLargeDTLB:
lwz r11, 4(r0)

lwz r12, 16(r0)
#ifdef CONFIG_8xx_CPU6
lwz r3, 8(r0)
#endif
rfi

/* This is the data TLB error on the MPC8xx. This could be due to
Expand Down

0 comments on commit 36c50f7

Please sign in to comment.