diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 10:50:33 +0100 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 10:50:33 +0100 |
| commit | 353816f43d1fb340ff2d9a911dd5d0799c09f6a5 (patch) | |
| tree | 517290fd884d286fe2971137ac89f89e3567785a /arch/sparc64/kernel/dtlb_miss.S | |
| parent | 160bbab3000dafccbe43688e48208cecf4deb879 (diff) | |
| parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/poodle.c
arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'arch/sparc64/kernel/dtlb_miss.S')
| -rw-r--r-- | arch/sparc64/kernel/dtlb_miss.S | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/arch/sparc64/kernel/dtlb_miss.S b/arch/sparc64/kernel/dtlb_miss.S deleted file mode 100644 index 09a6a15a710..00000000000 --- a/arch/sparc64/kernel/dtlb_miss.S +++ /dev/null @@ -1,39 +0,0 @@ -/* DTLB ** ICACHE line 1: Context 0 check and TSB load */ - ldxa [%g0] ASI_DMMU_TSB_8KB_PTR, %g1 ! Get TSB 8K pointer - ldxa [%g0] ASI_DMMU, %g6 ! Get TAG TARGET - srlx %g6, 48, %g5 ! Get context - sllx %g6, 22, %g6 ! Zero out context - brz,pn %g5, kvmap_dtlb ! Context 0 processing - srlx %g6, 22, %g6 ! Delay slot - TSB_LOAD_QUAD(%g1, %g4) ! Load TSB entry - cmp %g4, %g6 ! Compare TAG - -/* DTLB ** ICACHE line 2: TSB compare and TLB load */ - bne,pn %xcc, tsb_miss_dtlb ! Miss - mov FAULT_CODE_DTLB, %g3 - stxa %g5, [%g0] ASI_DTLB_DATA_IN ! Load TLB - retry ! Trap done - nop - nop - nop - nop - -/* DTLB ** ICACHE line 3: */ - nop - nop - nop - nop - nop - nop - nop - nop - -/* DTLB ** ICACHE line 4: */ - nop - nop - nop - nop - nop - nop - nop - nop |