[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1353055989-31939-3-git-send-email-yinghai@kernel.org>
Date: Fri, 16 Nov 2012 00:53:02 -0800
From: Yinghai Lu <yinghai@...nel.org>
To: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
"H. Peter Anvin" <hpa@...or.com>
Cc: linux-kernel@...r.kernel.org, Yinghai Lu <yinghai@...nel.org>,
Matt Fleming <matt.fleming@...el.com>
Subject: [PATCH 2/9] x86: Add macro for 64bit entry for bzImage
will use it with bzImage header.
Signed-off-by: Yinghai Lu <yinghai@...nel.org>
Cc: Matt Fleming <matt.fleming@...el.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists