* debian/changelog: Update.

* debian/config/config: Set MEMORY_HOTPLUG and MEMORY_HOTREMOVE.
* debian/config/powerpc/config.powerpc64: Remove unset of MEMORY_HOTPLUG.

svn path=/dists/trunk/linux-2.6/; revision=14743
This commit is contained in:
Bastian Blank 2009-12-06 19:43:15 +00:00
parent 7dbeb1b4e6
commit 539d8c57dd
3 changed files with 8 additions and 1 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
linux-2.6 (2.6.32-2) UNRELEASED; urgency=low
* Allow memory hot-add and -remove if possible.
-- Bastian Blank <waldi@debian.org> Sun, 06 Dec 2009 20:42:14 +0100
linux-2.6 (2.6.32-1) unstable; urgency=low
* New upstream release candidate:

View File

@ -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

View File

@ -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