diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-29 21:29:00 +0200 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2011-08-29 21:29:00 +0200 |
| commit | 96f90c791512bf8ceb50572a0e65d4cabb665c60 (patch) | |
| tree | 33ed5d6e4ce2ef005a43b0a5e2b9a70e3866d7f4 /arch/arm/include | |
| parent | Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into dev... (diff) | |
| parent | ARM: 7013/1: P2V: Remove ARM_PATCH_PHYS_VIRT_16BIT (diff) | |
| download | linux-96f90c791512bf8ceb50572a0e65d4cabb665c60.tar.xz linux-96f90c791512bf8ceb50572a0e65d4cabb665c60.zip | |
Merge the enabling by default of ARM_PATCH_PHYS_VIRT
Conflicts:
arch/arm/mach-msm/board-msm7x30.c
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/memory.h | 7 | ||||
| -rw-r--r-- | arch/arm/include/asm/module.h | 4 |
2 files changed, 0 insertions, 11 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 @@ * so that all we need to do is modify the 8-bit constant field. */ #define __PV_BITS_31_24 0x81000000 -#define __PV_BITS_23_16 0x00810000 extern unsigned long __pv_phys_offset; #define PHYS_OFFSET __pv_phys_offset @@ -169,9 +168,6 @@ static inline unsigned long __virt_to_phys(unsigned long x) { unsigned long t; __pv_stub(x, t, "add", __PV_BITS_31_24); -#ifdef CONFIG_ARM_PATCH_PHYS_VIRT_16BIT - __pv_stub(t, t, "add", __PV_BITS_23_16); -#endif return t; } @@ -179,9 +175,6 @@ static inline unsigned long __phys_to_virt(unsigned long x) { unsigned long t; __pv_stub(x, t, "sub", __PV_BITS_31_24); -#ifdef CONFIG_ARM_PATCH_PHYS_VIRT_16BIT - __pv_stub(t, t, "sub", __PV_BITS_23_16); -#endif return t; } #else diff --git a/arch/arm/include/asm/module.h b/arch/arm/include/asm/module.h index 543b44916d2c..6c6809f982f1 100644 --- a/arch/arm/include/asm/module.h +++ b/arch/arm/include/asm/module.h @@ -31,11 +31,7 @@ struct mod_arch_specific { /* Add __virt_to_phys patching state as well */ #ifdef CONFIG_ARM_PATCH_PHYS_VIRT -#ifdef CONFIG_ARM_PATCH_PHYS_VIRT_16BIT -#define MODULE_ARCH_VERMAGIC_P2V "p2v16 " -#else #define MODULE_ARCH_VERMAGIC_P2V "p2v8 " -#endif #else #define MODULE_ARCH_VERMAGIC_P2V "" #endif |