aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/head_40x.S
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/kernel/head_40x.S')
-rw-r--r--arch/powerpc/kernel/head_40x.S9
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/head_40x.S b/arch/powerpc/kernel/head_40x.S
index a90625f9b485..a91626d87fc9 100644
--- a/arch/powerpc/kernel/head_40x.S
+++ b/arch/powerpc/kernel/head_40x.S
@@ -40,6 +40,7 @@
40#include <asm/thread_info.h> 40#include <asm/thread_info.h>
41#include <asm/ppc_asm.h> 41#include <asm/ppc_asm.h>
42#include <asm/asm-offsets.h> 42#include <asm/asm-offsets.h>
43#include <asm/ptrace.h>
43 44
44/* As with the other PowerPC ports, it is expected that when code 45/* As with the other PowerPC ports, it is expected that when code
45 * execution begins here, the following registers contain valid, yet 46 * execution begins here, the following registers contain valid, yet
@@ -765,7 +766,7 @@ DataAccess:
765 * miss get to this point to load the TLB. 766 * miss get to this point to load the TLB.
766 * r10 - TLB_TAG value 767 * r10 - TLB_TAG value
767 * r11 - Linux PTE 768 * r11 - Linux PTE
768 * r12, r9 - avilable to use 769 * r12, r9 - available to use
769 * PID - loaded with proper value when we get here 770 * PID - loaded with proper value when we get here
770 * Upon exit, we reload everything and RFI. 771 * Upon exit, we reload everything and RFI.
771 * Actually, it will fit now, but oh well.....a common place 772 * Actually, it will fit now, but oh well.....a common place
@@ -923,11 +924,7 @@ initial_mmu:
923 mtspr SPRN_PID,r0 924 mtspr SPRN_PID,r0
924 sync 925 sync
925 926
926 /* Configure and load two entries into TLB slots 62 and 63. 927 /* Configure and load one entry into TLB slots 63 */
927 * In case we are pinning TLBs, these are reserved in by the
928 * other TLB functions. If not reserving, then it doesn't
929 * matter where they are loaded.
930 */
931 clrrwi r4,r4,10 /* Mask off the real page number */ 928 clrrwi r4,r4,10 /* Mask off the real page number */
932 ori r4,r4,(TLB_WR | TLB_EX) /* Set the write and execute bits */ 929 ori r4,r4,(TLB_WR | TLB_EX) /* Set the write and execute bits */
933 930