aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-05-25 14:57:43 +0800
committerAlex Shi <alex.shi@linaro.org>2016-05-25 14:57:43 +0800
commit6d8a08407839a0477081524f7d41d94a1c4f65ed (patch)
treee999f8d6fe22cd54bd85bc6c945699079e83de25
parent18df47fb3beb0347f04b8080111723811b9e9226 (diff)
arm64: Promote KERNEL_START/KERNEL_END definitions to a header file
upstream commits 28c7258330ee4ce701a4da7af96d6605d1a0b3bd KERNEL_START and KERNEL_END are useful outside head.S, move them to a header file. Signed-off-by: James Morse <james.morse@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Alex Shi <alex.shi@linaro.org>
-rw-r--r--arch/arm64/include/asm/memory.h3
-rw-r--r--arch/arm64/kernel/head.S3
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h
index 44a59c20e773..0a840bb203d8 100644
--- a/arch/arm64/include/asm/memory.h
+++ b/arch/arm64/include/asm/memory.h
@@ -86,6 +86,9 @@
#define __phys_to_pfn(paddr) ((unsigned long)((paddr) >> PAGE_SHIFT))
#define __pfn_to_phys(pfn) ((phys_addr_t)(pfn) << PAGE_SHIFT)
+#define KERNEL_START _text
+#define KERNEL_END _end
+
/*
* Convert a page to/from a physical address
*/
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index 64d68a2ab18e..1b65a6c1c001 100644
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -48,9 +48,6 @@
#error TEXT_OFFSET must be less than 2MB
#endif
-#define KERNEL_START _text
-#define KERNEL_END _end
-
/*
* Kernel startup entry point.
* ---------------------------