diff --git a/[refs] b/[refs] index 0f168d7cf087..0ee1b8acf82b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48c7ae674f03e56c78ff42c6796a36e90db67874 +refs/heads/master: 77e1dd654bc24182a7ad34f415abd488ae7af6eb diff --git a/trunk/arch/x86_64/Kconfig b/trunk/arch/x86_64/Kconfig index 5ce94430c019..8bdd25ac1542 100644 --- a/trunk/arch/x86_64/Kconfig +++ b/trunk/arch/x86_64/Kconfig @@ -427,6 +427,10 @@ config NR_CPUS This is purely to save memory - each supported CPU requires memory in the static kernel configuration. +config PHYSICAL_ALIGN + hex + default "0x200000" + config HOTPLUG_CPU bool "Support for suspend on SMP and hot-pluggable CPUs (EXPERIMENTAL)" depends on SMP && HOTPLUG && EXPERIMENTAL