diff options
author | H. Peter Anvin <hpa@zytor.com> | 2009-05-11 19:23:16 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-05-11 20:45:06 -0400 |
commit | fe83fcc0a14dcf71996de5eb84771b2369ba7abc (patch) | |
tree | 40af2bc6fc3dcad082b2b6bf22d3b8e0017be50a /arch/x86/configs | |
parent | c4a994645d04d5fa6bfa52a3204af87dd92168d5 (diff) |
x86, defconfig: update kernel position parameters
Update CONFIG_RELOCATABLE, CONFIG_PHYSICAL_START and
CONFIG_PHYSICAL_ALIGN to reflect the current defaults.
[ Impact: make defconfig match Kconfig defaults ]
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/configs')
-rw-r--r-- | arch/x86/configs/i386_defconfig | 7 | ||||
-rw-r--r-- | arch/x86/configs/x86_64_defconfig | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig index 70036a7a9506..edb992ebef92 100644 --- a/arch/x86/configs/i386_defconfig +++ b/arch/x86/configs/i386_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.30-rc2 | 3 | # Linux kernel version: 2.6.30-rc2 |
4 | # Mon May 11 16:19:47 2009 | 4 | # Mon May 11 16:21:55 2009 |
5 | # | 5 | # |
6 | # CONFIG_64BIT is not set | 6 | # CONFIG_64BIT is not set |
7 | CONFIG_X86_32=y | 7 | CONFIG_X86_32=y |
@@ -343,8 +343,9 @@ CONFIG_KEXEC=y | |||
343 | CONFIG_CRASH_DUMP=y | 343 | CONFIG_CRASH_DUMP=y |
344 | # CONFIG_KEXEC_JUMP is not set | 344 | # CONFIG_KEXEC_JUMP is not set |
345 | CONFIG_PHYSICAL_START=0x1000000 | 345 | CONFIG_PHYSICAL_START=0x1000000 |
346 | # CONFIG_RELOCATABLE is not set | 346 | CONFIG_RELOCATABLE=y |
347 | CONFIG_PHYSICAL_ALIGN=0x200000 | 347 | CONFIG_X86_NEED_RELOCS=y |
348 | CONFIG_PHYSICAL_ALIGN=0x1000000 | ||
348 | CONFIG_HOTPLUG_CPU=y | 349 | CONFIG_HOTPLUG_CPU=y |
349 | # CONFIG_COMPAT_VDSO is not set | 350 | # CONFIG_COMPAT_VDSO is not set |
350 | # CONFIG_CMDLINE_BOOL is not set | 351 | # CONFIG_CMDLINE_BOOL is not set |
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig index f3e53e21f438..4ba7d4ef9aac 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.30-rc2 | 3 | # Linux kernel version: 2.6.30-rc2 |
4 | # Mon May 11 16:19:24 2009 | 4 | # Mon May 11 16:22:00 2009 |
5 | # | 5 | # |
6 | CONFIG_64BIT=y | 6 | CONFIG_64BIT=y |
7 | # CONFIG_X86_32 is not set | 7 | # CONFIG_X86_32 is not set |
@@ -345,7 +345,7 @@ CONFIG_KEXEC=y | |||
345 | CONFIG_CRASH_DUMP=y | 345 | CONFIG_CRASH_DUMP=y |
346 | # CONFIG_KEXEC_JUMP is not set | 346 | # CONFIG_KEXEC_JUMP is not set |
347 | CONFIG_PHYSICAL_START=0x1000000 | 347 | CONFIG_PHYSICAL_START=0x1000000 |
348 | # CONFIG_RELOCATABLE is not set | 348 | CONFIG_RELOCATABLE=y |
349 | CONFIG_PHYSICAL_ALIGN=0x1000000 | 349 | CONFIG_PHYSICAL_ALIGN=0x1000000 |
350 | CONFIG_HOTPLUG_CPU=y | 350 | CONFIG_HOTPLUG_CPU=y |
351 | # CONFIG_COMPAT_VDSO is not set | 351 | # CONFIG_COMPAT_VDSO is not set |