[PATCH 2/9] x86: Add macro for 64bit entry for bzImage

Yinghai Lu
2012-11-16T08:54:52Z

will use it with bzImage header.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Matt Fleming <matt.fleming@intel.com>
---
arch/x86/boot/compressed/head_64.S | 2 +-
arch/x86/include/asm/boot.h | 2 ++
2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
index 4c8af67..0733638 100644
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -197,7 +197,7 @@ no_longmode:
* it may change in the future.
*/
.code64
- .org 0x208
+ .org BOOT_CODE64_START_OFFSET
ENTRY(startup_64)
/*
* We come here either from startup_32 or directly from a
diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
index b13fe63..bcae405 100644
--- a/arch/x86/include/asm/boot.h
+++ b/arch/x86/include/asm/boot.h
@@ -38,8 +38,10 @@

#ifdef CONFIG_X86_64
#define BOOT_STACK_SIZE 0x4000
+#define BOOT_CODE64_START_OFFSET 0x208
#else
#define BOOT_STACK_SIZE 0x1000
+#define BOOT_CODE64_START_OFFSET 0
#endif

#endif /* __KERNEL__ */
--
1.7.7