[kernel] r14743 - in dists/trunk/linux-2.6/debian: . config config/powerpc

[Bastian Blank]

Author: waldi
Date: Sun Dec  6 19:43:15 2009
New Revision: 14743

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

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Dec  6 19:39:24 2009	(r14742)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Dec  6 19:43:15 2009	(r14743)
@@ -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 at debian.org>  Sun, 06 Dec 2009 20:42:14 +0100
+
 linux-2.6 (2.6.32-1) unstable; urgency=low
 
   * New upstream release candidate:

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Sun Dec  6 19:39:24 2009	(r14742)
+++ dists/trunk/linux-2.6/debian/config/config	Sun Dec  6 19:43:15 2009	(r14743)
@@ -3140,6 +3140,8 @@
 ##
 ## file: mm/Kconfig
 ##
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_MIGRATION=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64	Sun Dec  6 19:39:24 2009	(r14742)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64	Sun Dec  6 19:43:15 2009	(r14743)
@@ -199,7 +199,6 @@
 CONFIG_SPARSEMEM_MANUAL=y
 ## end choice
 CONFIG_SPARSEMEM_VMEMMAP=y
-# CONFIG_MEMORY_HOTPLUG is not set
 
 ##
 ## file: sound/ppc/Kconfig