diff options
author | Franck Bui-Huu <vagabon.xyz@gmail.com> | 2007-02-15 08:21:36 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-10-11 18:45:59 -0400 |
commit | 054c51b4368648406f487f54b7ed6ba75bbb3f8b (patch) | |
tree | 89db2ea5e05fd95bff686d24383897332276e98b /include/asm-mips/stackframe.h | |
parent | adff90a9333004d5459823665e8bcf6cb9214f79 (diff) |
[MIPS] Rename CONFIG_BUILD_ELF64 into KBUILD_64BIT_SYM32
This patch renames it for 3 reasons:
- "CONFIG" pattern is used by Kconfig. Now this macro is
no more defined by Kconfig but by Kbuild itself make this
clear by translating "CONFIG" into "KBUILD".
- "ELF32" word is improper because it is irrelevant to ELF
format and it makes confusion with CONFIG_BOOT_ELF32. So
translate it with SYM32.
- Add "64BIT" part to make clear that this macro implies a
64 bits kernel.
Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include/asm-mips/stackframe.h')
-rw-r--r-- | include/asm-mips/stackframe.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-mips/stackframe.h b/include/asm-mips/stackframe.h index ed33366b85b8..59334f598b78 100644 --- a/include/asm-mips/stackframe.h +++ b/include/asm-mips/stackframe.h | |||
@@ -91,14 +91,14 @@ | |||
91 | #else | 91 | #else |
92 | MFC0 k0, CP0_CONTEXT | 92 | MFC0 k0, CP0_CONTEXT |
93 | #endif | 93 | #endif |
94 | #if defined(CONFIG_BUILD_ELF64) || (defined(CONFIG_64BIT) && __GNUC__ < 4) | 94 | #if defined(CONFIG_32BIT) || defined(KBUILD_64BIT_SYM32) |
95 | lui k1, %hi(kernelsp) | ||
96 | #else | ||
95 | lui k1, %highest(kernelsp) | 97 | lui k1, %highest(kernelsp) |
96 | daddiu k1, %higher(kernelsp) | 98 | daddiu k1, %higher(kernelsp) |
97 | dsll k1, 16 | 99 | dsll k1, 16 |
98 | daddiu k1, %hi(kernelsp) | 100 | daddiu k1, %hi(kernelsp) |
99 | dsll k1, 16 | 101 | dsll k1, 16 |
100 | #else | ||
101 | lui k1, %hi(kernelsp) | ||
102 | #endif | 102 | #endif |
103 | LONG_SRL k0, PTEBASE_SHIFT | 103 | LONG_SRL k0, PTEBASE_SHIFT |
104 | LONG_ADDU k1, k0 | 104 | LONG_ADDU k1, k0 |
@@ -116,14 +116,14 @@ | |||
116 | .endm | 116 | .endm |
117 | #else | 117 | #else |
118 | .macro get_saved_sp /* Uniprocessor variation */ | 118 | .macro get_saved_sp /* Uniprocessor variation */ |
119 | #if defined(CONFIG_BUILD_ELF64) || (defined(CONFIG_64BIT) && __GNUC__ < 4) | 119 | #if defined(CONFIG_32BIT) || defined(KBUILD_64BIT_SYM32) |
120 | lui k1, %hi(kernelsp) | ||
121 | #else | ||
120 | lui k1, %highest(kernelsp) | 122 | lui k1, %highest(kernelsp) |
121 | daddiu k1, %higher(kernelsp) | 123 | daddiu k1, %higher(kernelsp) |
122 | dsll k1, k1, 16 | 124 | dsll k1, k1, 16 |
123 | daddiu k1, %hi(kernelsp) | 125 | daddiu k1, %hi(kernelsp) |
124 | dsll k1, k1, 16 | 126 | dsll k1, k1, 16 |
125 | #else | ||
126 | lui k1, %hi(kernelsp) | ||
127 | #endif | 127 | #endif |
128 | LONG_L k1, %lo(kernelsp)(k1) | 128 | LONG_L k1, %lo(kernelsp)(k1) |
129 | .endm | 129 | .endm |