diff --git a/debian/changelog b/debian/changelog index b4ef1dd6f..811f52ce6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +linux-2.6 (2.6.32-2) UNRELEASED; urgency=low + + * Allow memory hot-add and -remove if possible. + + -- Bastian Blank Sun, 06 Dec 2009 20:42:14 +0100 + linux-2.6 (2.6.32-1) unstable; urgency=low * New upstream release candidate: diff --git a/debian/config/config b/debian/config/config index 7f4304b70..46952d399 100644 --- a/debian/config/config +++ b/debian/config/config @@ -3140,6 +3140,8 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y ## ## file: mm/Kconfig ## +CONFIG_MEMORY_HOTPLUG=y +CONFIG_MEMORY_HOTREMOVE=y CONFIG_MIGRATION=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 diff --git a/debian/config/powerpc/config.powerpc64 b/debian/config/powerpc/config.powerpc64 index 5d683504e..8ca4829b8 100644 --- a/debian/config/powerpc/config.powerpc64 +++ b/debian/config/powerpc/config.powerpc64 @@ -199,7 +199,6 @@ CONFIG_WATCHDOG_RTAS=m CONFIG_SPARSEMEM_MANUAL=y ## end choice CONFIG_SPARSEMEM_VMEMMAP=y -# CONFIG_MEMORY_HOTPLUG is not set ## ## file: sound/ppc/Kconfig