summaryrefslogtreecommitdiff
path: root/include/asm-i386
diff options
context:
space:
mode:
authorVivek Goyal <vgoyal@in.ibm.com>2007-01-05 16:36:30 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2007-01-05 23:55:23 -0800
commitdd0ec16fa6cf2498b831663a543e1b67fce6e155 (patch)
tree6b91a5ff9713c83f6026d1198be98f7ed1e845e6 /include/asm-i386
parenta75acf850ca80136a4f845cf9a7cd26e7465c1f4 (diff)
downloadlinux-3.10-dd0ec16fa6cf2498b831663a543e1b67fce6e155.tar.gz
linux-3.10-dd0ec16fa6cf2498b831663a543e1b67fce6e155.tar.bz2
linux-3.10-dd0ec16fa6cf2498b831663a543e1b67fce6e155.zip
[PATCH] i386: Restore CONFIG_PHYSICAL_START option
o Relocatable bzImage support had got rid of CONFIG_PHYSICAL_START option thinking that now this option is not required as people can build a second kernel as relocatable and load it anywhere. So need of compiling the kernel for a custom address was gone. But Magnus uses vmlinux images for second kernel in Xen environment and he wants to continue to use it. o Restoring the CONFIG_PHYSICAL_START option for the time being. I think down the line we can get rid of it. Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-i386')
-rw-r--r--include/asm-i386/boot.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-i386/boot.h b/include/asm-i386/boot.h
index 8ce79a6fa89..e7686d0a841 100644
--- a/include/asm-i386/boot.h
+++ b/include/asm-i386/boot.h
@@ -13,7 +13,8 @@
#define ASK_VGA 0xfffd /* ask for it at bootup */
/* Physical address where kenrel should be loaded. */
-#define LOAD_PHYSICAL_ADDR ((0x100000 + CONFIG_PHYSICAL_ALIGN - 1) \
+#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
+ + (CONFIG_PHYSICAL_ALIGN - 1)) \
& ~(CONFIG_PHYSICAL_ALIGN - 1))
#endif /* _LINUX_BOOT_H */