[PATCH] mips: clean up 32/64-bit configuration
Start cleaning 32-bit vs. 64-bit configuration. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

parent
63fb6fd1c8
commit
875d43e72b
@@ -26,7 +26,7 @@
|
||||
|
||||
.macro SAVE_TEMP
|
||||
mfhi v1
|
||||
#ifdef CONFIG_MIPS32
|
||||
#ifdef CONFIG_32BIT
|
||||
LONG_S $8, PT_R8(sp)
|
||||
LONG_S $9, PT_R9(sp)
|
||||
#endif
|
||||
@@ -56,7 +56,7 @@
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
.macro get_saved_sp /* SMP variation */
|
||||
#ifdef CONFIG_MIPS32
|
||||
#ifdef CONFIG_32BIT
|
||||
mfc0 k0, CP0_CONTEXT
|
||||
lui k1, %hi(kernelsp)
|
||||
srl k0, k0, 23
|
||||
@@ -64,7 +64,7 @@
|
||||
addu k1, k0
|
||||
LONG_L k1, %lo(kernelsp)(k1)
|
||||
#endif
|
||||
#if defined(CONFIG_MIPS64) && !defined(CONFIG_BUILD_ELF64)
|
||||
#if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64)
|
||||
MFC0 k1, CP0_CONTEXT
|
||||
dsra k1, 23
|
||||
lui k0, %hi(pgd_current)
|
||||
@@ -74,7 +74,7 @@
|
||||
daddu k1, k0
|
||||
LONG_L k1, %lo(kernelsp)(k1)
|
||||
#endif
|
||||
#if defined(CONFIG_MIPS64) && defined(CONFIG_BUILD_ELF64)
|
||||
#if defined(CONFIG_64BIT) && defined(CONFIG_BUILD_ELF64)
|
||||
MFC0 k1, CP0_CONTEXT
|
||||
dsrl k1, 23
|
||||
dsll k1, k1, 3
|
||||
@@ -83,20 +83,20 @@
|
||||
.endm
|
||||
|
||||
.macro set_saved_sp stackp temp temp2
|
||||
#ifdef CONFIG_MIPS32
|
||||
#ifdef CONFIG_32BIT
|
||||
mfc0 \temp, CP0_CONTEXT
|
||||
srl \temp, 23
|
||||
sll \temp, 2
|
||||
LONG_S \stackp, kernelsp(\temp)
|
||||
#endif
|
||||
#if defined(CONFIG_MIPS64) && !defined(CONFIG_BUILD_ELF64)
|
||||
#if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64)
|
||||
lw \temp, TI_CPU(gp)
|
||||
dsll \temp, 3
|
||||
lui \temp2, %hi(kernelsp)
|
||||
daddu \temp, \temp2
|
||||
LONG_S \stackp, %lo(kernelsp)(\temp)
|
||||
#endif
|
||||
#if defined(CONFIG_MIPS64) && defined(CONFIG_BUILD_ELF64)
|
||||
#if defined(CONFIG_64BIT) && defined(CONFIG_BUILD_ELF64)
|
||||
lw \temp, TI_CPU(gp)
|
||||
dsll \temp, 3
|
||||
LONG_S \stackp, kernelsp(\temp)
|
||||
@@ -140,7 +140,7 @@
|
||||
LONG_S $6, PT_R6(sp)
|
||||
MFC0 v1, CP0_EPC
|
||||
LONG_S $7, PT_R7(sp)
|
||||
#ifdef CONFIG_MIPS64
|
||||
#ifdef CONFIG_64BIT
|
||||
LONG_S $8, PT_R8(sp)
|
||||
LONG_S $9, PT_R9(sp)
|
||||
#endif
|
||||
@@ -169,7 +169,7 @@
|
||||
|
||||
.macro RESTORE_TEMP
|
||||
LONG_L $24, PT_LO(sp)
|
||||
#ifdef CONFIG_MIPS32
|
||||
#ifdef CONFIG_32BIT
|
||||
LONG_L $8, PT_R8(sp)
|
||||
LONG_L $9, PT_R9(sp)
|
||||
#endif
|
||||
@@ -217,7 +217,7 @@
|
||||
LONG_L $31, PT_R31(sp)
|
||||
LONG_L $28, PT_R28(sp)
|
||||
LONG_L $25, PT_R25(sp)
|
||||
#ifdef CONFIG_MIPS64
|
||||
#ifdef CONFIG_64BIT
|
||||
LONG_L $8, PT_R8(sp)
|
||||
LONG_L $9, PT_R9(sp)
|
||||
#endif
|
||||
@@ -262,7 +262,7 @@
|
||||
LONG_L $31, PT_R31(sp)
|
||||
LONG_L $28, PT_R28(sp)
|
||||
LONG_L $25, PT_R25(sp)
|
||||
#ifdef CONFIG_MIPS64
|
||||
#ifdef CONFIG_64BIT
|
||||
LONG_L $8, PT_R8(sp)
|
||||
LONG_L $9, PT_R9(sp)
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user