1 files changed, 11 insertions, 11 deletions
diff --git a/include/asm-mips/stackframe.h b/include/asm-mips/stackframe.h
index 86283c25fd5b..fb42f99f8527 100644
--- a/include/asm-mips/stackframe.h
+++ b/include/asm-mips/stackframe.h
@@ -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

diff --git a/include/asm-mips/stackframe.h b/include/asm-mips/stackframe.h index 86283c25fd5b..fb42f99f8527 100644 --- a/include/asm-mips/stackframe.h +++ b/include/asm-mips/stackframe.h
@@ -26,7 +26,7 @@
26		26
27	.macro SAVE_TEMP	27	.macro SAVE_TEMP
28	mfhi v1	28	mfhi v1
29	#ifdef CONFIG_MIPS32	29	#ifdef CONFIG_32BIT
30	LONG_S $8, PT_R8(sp)	30	LONG_S $8, PT_R8(sp)
31	LONG_S $9, PT_R9(sp)	31	LONG_S $9, PT_R9(sp)
32	#endif	32	#endif
@@ -56,7 +56,7 @@
56		56
57	#ifdef CONFIG_SMP	57	#ifdef CONFIG_SMP
58	.macro get_saved_sp /* SMP variation */	58	.macro get_saved_sp /* SMP variation */
59	#ifdef CONFIG_MIPS32	59	#ifdef CONFIG_32BIT
60	mfc0 k0, CP0_CONTEXT	60	mfc0 k0, CP0_CONTEXT
61	lui k1, %hi(kernelsp)	61	lui k1, %hi(kernelsp)
62	srl k0, k0, 23	62	srl k0, k0, 23
@@ -64,7 +64,7 @@
64	addu k1, k0	64	addu k1, k0
65	LONG_L k1, %lo(kernelsp)(k1)	65	LONG_L k1, %lo(kernelsp)(k1)
66	#endif	66	#endif
67	#if defined(CONFIG_MIPS64) && !defined(CONFIG_BUILD_ELF64)	67	#if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64)
68	MFC0 k1, CP0_CONTEXT	68	MFC0 k1, CP0_CONTEXT
69	dsra k1, 23	69	dsra k1, 23
70	lui k0, %hi(pgd_current)	70	lui k0, %hi(pgd_current)
@@ -74,7 +74,7 @@
74	daddu k1, k0	74	daddu k1, k0
75	LONG_L k1, %lo(kernelsp)(k1)	75	LONG_L k1, %lo(kernelsp)(k1)
76	#endif	76	#endif
77	#if defined(CONFIG_MIPS64) && defined(CONFIG_BUILD_ELF64)	77	#if defined(CONFIG_64BIT) && defined(CONFIG_BUILD_ELF64)
78	MFC0 k1, CP0_CONTEXT	78	MFC0 k1, CP0_CONTEXT
79	dsrl k1, 23	79	dsrl k1, 23
80	dsll k1, k1, 3	80	dsll k1, k1, 3
@@ -83,20 +83,20 @@
83	.endm	83	.endm
84		84
85	.macro set_saved_sp stackp temp temp2	85	.macro set_saved_sp stackp temp temp2
86	#ifdef CONFIG_MIPS32	86	#ifdef CONFIG_32BIT
87	mfc0 \temp, CP0_CONTEXT	87	mfc0 \temp, CP0_CONTEXT
88	srl \temp, 23	88	srl \temp, 23
89	sll \temp, 2	89	sll \temp, 2
90	LONG_S \stackp, kernelsp(\temp)	90	LONG_S \stackp, kernelsp(\temp)
91	#endif	91	#endif
92	#if defined(CONFIG_MIPS64) && !defined(CONFIG_BUILD_ELF64)	92	#if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64)
93	lw \temp, TI_CPU(gp)	93	lw \temp, TI_CPU(gp)
94	dsll \temp, 3	94	dsll \temp, 3
95	lui \temp2, %hi(kernelsp)	95	lui \temp2, %hi(kernelsp)
96	daddu \temp, \temp2	96	daddu \temp, \temp2
97	LONG_S \stackp, %lo(kernelsp)(\temp)	97	LONG_S \stackp, %lo(kernelsp)(\temp)
98	#endif	98	#endif
99	#if defined(CONFIG_MIPS64) && defined(CONFIG_BUILD_ELF64)	99	#if defined(CONFIG_64BIT) && defined(CONFIG_BUILD_ELF64)
100	lw \temp, TI_CPU(gp)	100	lw \temp, TI_CPU(gp)
101	dsll \temp, 3	101	dsll \temp, 3
102	LONG_S \stackp, kernelsp(\temp)	102	LONG_S \stackp, kernelsp(\temp)
@@ -140,7 +140,7 @@
140	LONG_S $6, PT_R6(sp)	140	LONG_S $6, PT_R6(sp)
141	MFC0 v1, CP0_EPC	141	MFC0 v1, CP0_EPC
142	LONG_S $7, PT_R7(sp)	142	LONG_S $7, PT_R7(sp)
143	#ifdef CONFIG_MIPS64	143	#ifdef CONFIG_64BIT
144	LONG_S $8, PT_R8(sp)	144	LONG_S $8, PT_R8(sp)
145	LONG_S $9, PT_R9(sp)	145	LONG_S $9, PT_R9(sp)
146	#endif	146	#endif
@@ -169,7 +169,7 @@
169		169
170	.macro RESTORE_TEMP	170	.macro RESTORE_TEMP
171	LONG_L $24, PT_LO(sp)	171	LONG_L $24, PT_LO(sp)
172	#ifdef CONFIG_MIPS32	172	#ifdef CONFIG_32BIT
173	LONG_L $8, PT_R8(sp)	173	LONG_L $8, PT_R8(sp)
174	LONG_L $9, PT_R9(sp)	174	LONG_L $9, PT_R9(sp)
175	#endif	175	#endif
@@ -217,7 +217,7 @@
217	LONG_L $31, PT_R31(sp)	217	LONG_L $31, PT_R31(sp)
218	LONG_L $28, PT_R28(sp)	218	LONG_L $28, PT_R28(sp)
219	LONG_L $25, PT_R25(sp)	219	LONG_L $25, PT_R25(sp)
220	#ifdef CONFIG_MIPS64	220	#ifdef CONFIG_64BIT
221	LONG_L $8, PT_R8(sp)	221	LONG_L $8, PT_R8(sp)
222	LONG_L $9, PT_R9(sp)	222	LONG_L $9, PT_R9(sp)
223	#endif	223	#endif
@@ -262,7 +262,7 @@
262	LONG_L $31, PT_R31(sp)	262	LONG_L $31, PT_R31(sp)
263	LONG_L $28, PT_R28(sp)	263	LONG_L $28, PT_R28(sp)
264	LONG_L $25, PT_R25(sp)	264	LONG_L $25, PT_R25(sp)
265	#ifdef CONFIG_MIPS64	265	#ifdef CONFIG_64BIT
266	LONG_L $8, PT_R8(sp)	266	LONG_L $8, PT_R8(sp)
267	LONG_L $9, PT_R9(sp)	267	LONG_L $9, PT_R9(sp)
268	#endif	268	#endif