diff options
Diffstat (limited to 'arch/arm/include/asm/memory.h')
-rw-r--r-- | arch/arm/include/asm/memory.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 652fccca4952..90bca427e367 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h | |||
@@ -151,7 +151,6 @@ | |||
151 | * so that all we need to do is modify the 8-bit constant field. | 151 | * so that all we need to do is modify the 8-bit constant field. |
152 | */ | 152 | */ |
153 | #define __PV_BITS_31_24 0x81000000 | 153 | #define __PV_BITS_31_24 0x81000000 |
154 | #define __PV_BITS_23_16 0x00810000 | ||
155 | 154 | ||
156 | extern unsigned long __pv_phys_offset; | 155 | extern unsigned long __pv_phys_offset; |
157 | #define PHYS_OFFSET __pv_phys_offset | 156 | #define PHYS_OFFSET __pv_phys_offset |
@@ -169,9 +168,6 @@ static inline unsigned long __virt_to_phys(unsigned long x) | |||
169 | { | 168 | { |
170 | unsigned long t; | 169 | unsigned long t; |
171 | __pv_stub(x, t, "add", __PV_BITS_31_24); | 170 | __pv_stub(x, t, "add", __PV_BITS_31_24); |
172 | #ifdef CONFIG_ARM_PATCH_PHYS_VIRT_16BIT | ||
173 | __pv_stub(t, t, "add", __PV_BITS_23_16); | ||
174 | #endif | ||
175 | return t; | 171 | return t; |
176 | } | 172 | } |
177 | 173 | ||
@@ -179,9 +175,6 @@ static inline unsigned long __phys_to_virt(unsigned long x) | |||
179 | { | 175 | { |
180 | unsigned long t; | 176 | unsigned long t; |
181 | __pv_stub(x, t, "sub", __PV_BITS_31_24); | 177 | __pv_stub(x, t, "sub", __PV_BITS_31_24); |
182 | #ifdef CONFIG_ARM_PATCH_PHYS_VIRT_16BIT | ||
183 | __pv_stub(t, t, "sub", __PV_BITS_23_16); | ||
184 | #endif | ||
185 | return t; | 178 | return t; |
186 | } | 179 | } |
187 | #else | 180 | #else |