Commit 9a5ce9cb authored by Keith M. Wesolowski's avatar Keith M. Wesolowski

[SPARC]: Replace "magic" values.

parent 700a4acb
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <asm/winmacro.h> #include <asm/winmacro.h>
#include <asm/thread_info.h> /* TI_UWINMASK */ #include <asm/thread_info.h> /* TI_UWINMASK */
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/pgtsrmmu.h> /* SRMMU_PGDIR_SHIFT */
.data .data
/* /*
...@@ -623,12 +624,8 @@ srmmu_remap: ...@@ -623,12 +624,8 @@ srmmu_remap:
/* Ok, pull in the PTD. */ /* Ok, pull in the PTD. */
lda [%o1] ASI_M_BYPASS, %o2 ! This is the 0x0 16MB pgd lda [%o1] ASI_M_BYPASS, %o2 ! This is the 0x0 16MB pgd
/* Calculate to KERNBASE entry. /* Calculate to KERNBASE entry. */
* add %o1, KERNBASE >> (SRMMU_PGDIR_SHIFT - 2), %o3
* XXX Should not use empirical constant, but Gas gets an XXX
* XXX upset stomach with the bitshift I would have to use XXX
*/
add %o1, 0x3c0, %o3
/* Poke the entry into the calculated address. */ /* Poke the entry into the calculated address. */
sta %o2, [%o3] ASI_M_BYPASS sta %o2, [%o3] ASI_M_BYPASS
...@@ -672,7 +669,7 @@ srmmu_nviking: ...@@ -672,7 +669,7 @@ srmmu_nviking:
sll %g1, 0x8, %g1 ! make phys addr for l1 tbl sll %g1, 0x8, %g1 ! make phys addr for l1 tbl
lda [%g1] ASI_M_BYPASS, %g2 ! get level1 entry for 0x0 lda [%g1] ASI_M_BYPASS, %g2 ! get level1 entry for 0x0
add %g1, 0x3c0, %g3 ! XXX AWAY WITH EMPIRICALS add %g1, KERNBASE >> (SRMMU_PGDIR_SHIFT - 2), %g3
sta %g2, [%g3] ASI_M_BYPASS ! place at KERNBASE entry sta %g2, [%g3] ASI_M_BYPASS ! place at KERNBASE entry
b go_to_highmem b go_to_highmem
nop ! wheee.... nop ! wheee....
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
/* #include <asm/head.h> XXX */ /* for KERNBASE */
#include <asm/btfixup.h> #include <asm/btfixup.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment