diff options
author | David S. Miller <davem@davemloft.net> | 2006-01-31 21:33:25 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-03-20 04:11:24 -0500 |
commit | 3487d1d4414fbfab5d98ec559e6f84f55520cb15 (patch) | |
tree | b85ac7e9d8c07bd3c8a9d314d650b04cdf1ccc96 /arch/sparc64/kernel | |
parent | 6b6d017235acad3ee1681140795593723bb9b9df (diff) |
[SPARC64]: Kill PROM locked TLB entry preservation code.
It is totally unnecessary complexity. After we take over
the trap table, we handle all PROM tlb misses fully.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel')
-rw-r--r-- | arch/sparc64/kernel/smp.c | 4 | ||||
-rw-r--r-- | arch/sparc64/kernel/tsb.S | 7 |
2 files changed, 0 insertions, 11 deletions
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c index d030c311cf..0e7552546d 100644 --- a/arch/sparc64/kernel/smp.c +++ b/arch/sparc64/kernel/smp.c | |||
@@ -116,14 +116,10 @@ static void smp_setup_percpu_timer(void); | |||
116 | 116 | ||
117 | static volatile unsigned long callin_flag = 0; | 117 | static volatile unsigned long callin_flag = 0; |
118 | 118 | ||
119 | extern void inherit_locked_prom_mappings(int save_p); | ||
120 | |||
121 | void __init smp_callin(void) | 119 | void __init smp_callin(void) |
122 | { | 120 | { |
123 | int cpuid = hard_smp_processor_id(); | 121 | int cpuid = hard_smp_processor_id(); |
124 | 122 | ||
125 | inherit_locked_prom_mappings(0); | ||
126 | |||
127 | __local_per_cpu_offset = __per_cpu_offset(cpuid); | 123 | __local_per_cpu_offset = __per_cpu_offset(cpuid); |
128 | 124 | ||
129 | __flush_tlb_all(); | 125 | __flush_tlb_all(); |
diff --git a/arch/sparc64/kernel/tsb.S b/arch/sparc64/kernel/tsb.S index c1532292a6..c4e7740d5e 100644 --- a/arch/sparc64/kernel/tsb.S +++ b/arch/sparc64/kernel/tsb.S | |||
@@ -178,13 +178,6 @@ __tsb_context_switch: | |||
178 | brz %o2, 9f | 178 | brz %o2, 9f |
179 | nop | 179 | nop |
180 | 180 | ||
181 | /* We use entry 61 for this locked entry. This is the spitfire | ||
182 | * TLB entry number, and luckily cheetah masks the value with | ||
183 | * 15 ending us up with entry 13 which is what we want in that | ||
184 | * case too. | ||
185 | * | ||
186 | * XXX Interactions with prom_world()... | ||
187 | */ | ||
188 | sethi %hi(sparc64_highest_unlocked_tlb_ent), %o4 | 181 | sethi %hi(sparc64_highest_unlocked_tlb_ent), %o4 |
189 | mov TLB_TAG_ACCESS, %g1 | 182 | mov TLB_TAG_ACCESS, %g1 |
190 | lduw [%o4 + %lo(sparc64_highest_unlocked_tlb_ent)], %g2 | 183 | lduw [%o4 + %lo(sparc64_highest_unlocked_tlb_ent)], %g2 |