Merge branch 'p2v' into devel

Conflicts:
	arch/arm/kernel/module.c
	arch/arm/mach-s5pv210/sleep.S

1 files changed, 16 insertions, 0 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ababf41517d6..48a0628d93e8 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -190,6 +190,22 @@ config VECTORS_BASE
         help
           The base address of exception vectors.
 
+config ARM_PATCH_PHYS_VIRT
+        bool "Patch physical to virtual translations at runtime (EXPERIMENTAL)"
+        depends on EXPERIMENTAL
+        depends on !XIP_KERNEL && MMU
+        depends on !ARCH_REALVIEW || !SPARSEMEM
+        help
+          Patch phys-to-virt translation functions at runtime according to
+          the position of the kernel in system memory.
+
+          This can only be used with non-XIP with MMU kernels where
+          the base of physical memory is at a 16MB boundary.
+
+config ARM_PATCH_PHYS_VIRT_16BIT
+        def_bool y
+        depends on ARM_PATCH_PHYS_VIRT && ARCH_MSM
+
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"