All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yinghai Lu <yinghai@kernel.org>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>
Cc: linux-kernel@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>,
	Matt Fleming <matt.fleming@intel.com>
Subject: [PATCH 2/9] x86: Add macro for 64bit entry for bzImage
Date: Fri, 16 Nov 2012 00:53:02 -0800	[thread overview]
Message-ID: <1353055989-31939-3-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1353055989-31939-1-git-send-email-yinghai@kernel.org>

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


  parent reply	other threads:[~2012-11-16  8:54 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-16  8:53 [PATCH 0/9] x86, boot, 64bit: Add support for loading ramdisk and bzImage high Yinghai Lu
2012-11-16  8:53 ` [PATCH 1/9] x86, boot: Move lldt/ltr out of 64bit only path Yinghai Lu
2012-11-16 15:55   ` H. Peter Anvin
2012-11-16 18:15     ` Yinghai Lu
2012-11-16  8:53 ` Yinghai Lu [this message]
2012-11-16 15:56   ` [PATCH 2/9] x86: Add macro for 64bit entry for bzImage H. Peter Anvin
2012-11-16  8:53 ` [PATCH 3/9] x86, 64bit: set extra ident page table for whole kernel range Yinghai Lu
2012-11-16  8:53 ` [PATCH 4/9] x86, 64bit: add support for loading kernel above 512G Yinghai Lu
2012-11-16  8:53 ` [PATCH 5/9] x86: Merge early_reserve_initrd for 32bit and 64bit Yinghai Lu
2012-11-16  8:53 ` [PATCH 6/9] x86: add get_ramdisk_image/size Yinghai Lu
2012-11-16  8:53 ` [PATCH 7/9] x86, boot: add field to support load bzImage and ramdisk high Yinghai Lu
2012-11-16  8:53 ` [PATCH 8/9] x86: ramdisk info print with high bits Yinghai Lu
2012-11-16 16:05   ` H. Peter Anvin
2012-11-16 19:21     ` Yinghai Lu
2012-11-16 19:32       ` Yinghai Lu
2012-11-16 19:39         ` H. Peter Anvin
2012-11-20  1:38         ` Valdis.Kletnieks
2012-11-16 19:39       ` H. Peter Anvin
2012-11-16 19:59         ` Yinghai Lu
2012-11-16 20:08           ` H. Peter Anvin
2012-11-16 20:12             ` Yinghai Lu
2012-11-16 20:25               ` H. Peter Anvin
2012-11-16 20:40                 ` Yinghai Lu
2012-11-16  8:53 ` [PATCH 9/9] x86: remove 1024g limitation for kexec buffer on 64bit Yinghai Lu
2012-11-16 16:17 ` [PATCH 0/9] x86, boot, 64bit: Add support for loading ramdisk and bzImage high H. Peter Anvin
2012-11-17  0:40   ` Yinghai Lu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1353055989-31939-3-git-send-email-yinghai@kernel.org \
    --to=yinghai@kernel.org \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=matt.fleming@intel.com \
    --cc=mingo@elte.hu \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.