summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel
diff options
context:
space:
mode:
authorNicolas Pitre2011-07-06 04:52:51 +0200
committerNicolas Pitre2011-09-26 16:11:58 +0200
commit1b9f95f8ade9efc2bd49f0e7b9dc61a038ac3eef (patch)
tree3e5d06f8e6a0b177ff2e201fb76fdf319a229f8e /arch/arm/kernel
parentARM: mach-davinci: clean up debug-macro.S (diff)
downloadkernel-qcow2-linux-1b9f95f8ade9efc2bd49f0e7b9dc61a038ac3eef.tar.gz
kernel-qcow2-linux-1b9f95f8ade9efc2bd49f0e7b9dc61a038ac3eef.tar.xz
kernel-qcow2-linux-1b9f95f8ade9efc2bd49f0e7b9dc61a038ac3eef.zip
ARM: prepare for removal of a bunch of <mach/memory.h> files
When the CONFIG_NO_MACH_MEMORY_H symbol is selected by a particular machine class, the machine specific memory.h include file is no longer used and can be removed. In that case the equivalent information can be obtained dynamically at runtime by enabling CONFIG_ARM_PATCH_PHYS_VIRT or by specifying the physical memory address at kernel configuration time. If/when all instances of mach/memory.h are removed then this symbol could be removed. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r--arch/arm/kernel/head.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 7408fd506656..673c806cc106 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -95,7 +95,7 @@ ENTRY(stext)
sub r4, r3, r4 @ (PHYS_OFFSET - PAGE_OFFSET)
add r8, r8, r4 @ PHYS_OFFSET
#else
- ldr r8, =PLAT_PHYS_OFFSET
+ ldr r8, =PHYS_OFFSET @ always constant in this case
#endif
/*