summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2013-05-01 21:55:43 (GMT)
committerH. Peter Anvin <hpa@linux.intel.com>2013-05-01 21:55:43 (GMT)
commita8d8e72ff5b910b1706f40dd3d249edf1ba2701e (patch)
tree70af5eb0790be9840dcebfbc68a98c2e911ce1ff
parent370a70feb236d1bd667d3e68739e324a195d03e3 (diff)
parentff10318e702301ccec8bedc8fa1269086ecd5495 (diff)
downloadktest-a8d8e72ff5b910b1706f40dd3d249edf1ba2701e.zip
ktest-a8d8e72ff5b910b1706f40dd3d249edf1ba2701e.tar.gz
ktest-a8d8e72ff5b910b1706f40dd3d249edf1ba2701e.tar.bz2
ktest-a8d8e72ff5b910b1706f40dd3d249edf1ba2701e.tar.xz
Merge branch 'master' of ssh://terminus.zytor.com/home/hpa/ktest/ktest
-rw-r--r--config.i3862
-rw-r--r--config.i386-pae4
-rw-r--r--config.tazenda2
-rw-r--r--config.voreg2
-rw-r--r--config.x86_642
5 files changed, 6 insertions, 6 deletions
diff --git a/config.i386 b/config.i386
index 9856581..0d193cf 100644
--- a/config.i386
+++ b/config.i386
@@ -403,7 +403,7 @@ CONFIG_KEXEC=y
CONFIG_PHYSICAL_START=0x1000000
CONFIG_RELOCATABLE=y
CONFIG_X86_NEED_RELOCS=y
-CONFIG_PHYSICAL_ALIGN=0x400000
+CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_COMPAT_VDSO=y
# CONFIG_CMDLINE_BOOL is not set
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
diff --git a/config.i386-pae b/config.i386-pae
index bc2e761..863dd76 100644
--- a/config.i386-pae
+++ b/config.i386-pae
@@ -147,7 +147,7 @@ CONFIG_RD_BZIP2=y
CONFIG_RD_LZMA=y
CONFIG_RD_XZ=y
CONFIG_RD_LZO=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
# CONFIG_EXPERT is not set
@@ -429,7 +429,7 @@ CONFIG_KEXEC=y
CONFIG_PHYSICAL_START=0x1000000
CONFIG_RELOCATABLE=y
CONFIG_X86_NEED_RELOCS=y
-CONFIG_PHYSICAL_ALIGN=0x400000
+CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_HOTPLUG_CPU=y
# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
diff --git a/config.tazenda b/config.tazenda
index 446c54a..7eadac1 100644
--- a/config.tazenda
+++ b/config.tazenda
@@ -324,7 +324,7 @@ CONFIG_KEXEC=y
CONFIG_CRASH_DUMP=y
CONFIG_PHYSICAL_START=0x1000000
CONFIG_RELOCATABLE=y
-CONFIG_PHYSICAL_ALIGN=0x200000
+CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_HOTPLUG_CPU=y
# CONFIG_HOTPLUG_RESTRICT_TO_BOOTUP_CPUS is not set
CONFIG_HOTPLUG_ADDITIONAL_CPUS=-1
diff --git a/config.voreg b/config.voreg
index bccc3cc..4ac0ebd 100644
--- a/config.voreg
+++ b/config.voreg
@@ -285,7 +285,7 @@ CONFIG_KEXEC=y
CONFIG_CRASH_DUMP=y
CONFIG_PHYSICAL_START=0x1000000
CONFIG_RELOCATABLE=y
-CONFIG_PHYSICAL_ALIGN=0x200000
+CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_HOTPLUG_CPU=y
# CONFIG_COMPAT_VDSO is not set
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
diff --git a/config.x86_64 b/config.x86_64
index 441d18c..503d398 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -163,7 +163,7 @@ CONFIG_RD_BZIP2=y
CONFIG_RD_LZMA=y
CONFIG_RD_XZ=y
CONFIG_RD_LZO=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
# CONFIG_EXPERT is not set