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

[Bastian Blank]

Author: waldi
Date: Sat Dec 12 12:36:14 2009
New Revision: 14777

Log:
* debian/changelog: Update.
* debian/config/config: Enable KSM.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sat Dec 12 01:04:34 2009	(r14776)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Dec 12 12:36:14 2009	(r14777)
@@ -3,6 +3,7 @@
   [ Bastian Blank ]
   * Allow memory hot-add and -remove if possible.
   * Enable USB suspend.
+  * Enable kernel samepage merging. (closes: #558200)
 
   [ Moritz Muehlenhoff ]
   * Disable cryptoloop (Closes: #559755)

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Sat Dec 12 01:04:34 2009	(r14776)
+++ dists/trunk/linux-2.6/debian/config/config	Sat Dec 12 12:36:14 2009	(r14777)
@@ -3169,6 +3169,7 @@
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_MIGRATION=y
+CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 
 ##