diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-02-22 18:06:55 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-03-21 08:27:46 -0500 |
commit | 8145095cd8fd466980ea6401f26a52e462275222 (patch) | |
tree | c6f8642c2137f5fb053f018185cfd15ff7a34c00 /include/asm-mips | |
parent | 219ac73a7ad17a3ae3d5c07b4fc8c280645a073a (diff) |
[MIPS] Remove CONFIG_BUILD_ELF64.
This option is no longer usable with supported compilers. It will be
replaced by usage of -msym32 in a separate patch.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include/asm-mips')
-rw-r--r-- | include/asm-mips/mmu_context.h | 7 | ||||
-rw-r--r-- | include/asm-mips/sn/mapped_kernel.h | 4 | ||||
-rw-r--r-- | include/asm-mips/stackframe.h | 20 |
3 files changed, 4 insertions, 27 deletions
diff --git a/include/asm-mips/mmu_context.h b/include/asm-mips/mmu_context.h index 19cdf7642e66..61cf22588137 100644 --- a/include/asm-mips/mmu_context.h +++ b/include/asm-mips/mmu_context.h | |||
@@ -33,12 +33,7 @@ extern unsigned long pgd_current[]; | |||
33 | write_c0_context((unsigned long) smp_processor_id() << 25); \ | 33 | write_c0_context((unsigned long) smp_processor_id() << 25); \ |
34 | TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir) | 34 | TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir) |
35 | #endif | 35 | #endif |
36 | #if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64) | 36 | #ifdef CONFIG_64BIT |
37 | #define TLBMISS_HANDLER_SETUP() \ | ||
38 | write_c0_context((unsigned long) &pgd_current[smp_processor_id()] << 23); \ | ||
39 | TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir) | ||
40 | #endif | ||
41 | #if defined(CONFIG_64BIT) && defined(CONFIG_BUILD_ELF64) | ||
42 | #define TLBMISS_HANDLER_SETUP() \ | 37 | #define TLBMISS_HANDLER_SETUP() \ |
43 | write_c0_context((unsigned long) smp_processor_id() << 26); \ | 38 | write_c0_context((unsigned long) smp_processor_id() << 26); \ |
44 | TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir) | 39 | TLBMISS_HANDLER_SETUP_PGD(swapper_pg_dir) |
diff --git a/include/asm-mips/sn/mapped_kernel.h b/include/asm-mips/sn/mapped_kernel.h index 3a17846df849..59edb20f8ec5 100644 --- a/include/asm-mips/sn/mapped_kernel.h +++ b/include/asm-mips/sn/mapped_kernel.h | |||
@@ -23,11 +23,7 @@ | |||
23 | #include <linux/config.h> | 23 | #include <linux/config.h> |
24 | #include <asm/addrspace.h> | 24 | #include <asm/addrspace.h> |
25 | 25 | ||
26 | #ifdef CONFIG_BUILD_ELF64 | ||
27 | #define REP_BASE CAC_BASE | 26 | #define REP_BASE CAC_BASE |
28 | #else | ||
29 | #define REP_BASE CKSEG0 | ||
30 | #endif | ||
31 | 27 | ||
32 | #ifdef CONFIG_MAPPED_KERNEL | 28 | #ifdef CONFIG_MAPPED_KERNEL |
33 | 29 | ||
diff --git a/include/asm-mips/stackframe.h b/include/asm-mips/stackframe.h index a8919dcc93c8..2acf3e844f00 100644 --- a/include/asm-mips/stackframe.h +++ b/include/asm-mips/stackframe.h | |||
@@ -63,17 +63,7 @@ | |||
63 | addu k1, k0 | 63 | addu k1, k0 |
64 | LONG_L k1, %lo(kernelsp)(k1) | 64 | LONG_L k1, %lo(kernelsp)(k1) |
65 | #endif | 65 | #endif |
66 | #if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64) | 66 | #ifdef CONFIG_64BIT |
67 | MFC0 k1, CP0_CONTEXT | ||
68 | dsra k1, 23 | ||
69 | lui k0, %hi(pgd_current) | ||
70 | addiu k0, %lo(pgd_current) | ||
71 | dsubu k1, k0 | ||
72 | lui k0, %hi(kernelsp) | ||
73 | daddu k1, k0 | ||
74 | LONG_L k1, %lo(kernelsp)(k1) | ||
75 | #endif | ||
76 | #if defined(CONFIG_64BIT) && defined(CONFIG_BUILD_ELF64) | ||
77 | MFC0 k1, CP0_CONTEXT | 67 | MFC0 k1, CP0_CONTEXT |
78 | lui k0, %highest(kernelsp) | 68 | lui k0, %highest(kernelsp) |
79 | dsrl k1, 23 | 69 | dsrl k1, 23 |
@@ -91,11 +81,7 @@ | |||
91 | mfc0 \temp, CP0_CONTEXT | 81 | mfc0 \temp, CP0_CONTEXT |
92 | srl \temp, 23 | 82 | srl \temp, 23 |
93 | #endif | 83 | #endif |
94 | #if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64) | 84 | #ifdef CONFIG_64BIT |
95 | lw \temp, TI_CPU(gp) | ||
96 | dsll \temp, 3 | ||
97 | #endif | ||
98 | #if defined(CONFIG_64BIT) && defined(CONFIG_BUILD_ELF64) | ||
99 | MFC0 \temp, CP0_CONTEXT | 85 | MFC0 \temp, CP0_CONTEXT |
100 | dsrl \temp, 23 | 86 | dsrl \temp, 23 |
101 | #endif | 87 | #endif |
@@ -103,7 +89,7 @@ | |||
103 | .endm | 89 | .endm |
104 | #else | 90 | #else |
105 | .macro get_saved_sp /* Uniprocessor variation */ | 91 | .macro get_saved_sp /* Uniprocessor variation */ |
106 | #if defined(CONFIG_64BIT) && defined(CONFIG_BUILD_ELF64) | 92 | #ifdef CONFIG_64BIT |
107 | lui k1, %highest(kernelsp) | 93 | lui k1, %highest(kernelsp) |
108 | daddiu k1, %higher(kernelsp) | 94 | daddiu k1, %higher(kernelsp) |
109 | dsll k1, k1, 16 | 95 | dsll k1, k1, 16 |