From patchwork Mon Dec  7 15:06:00 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Enable CONFIG_KSM
Date: Mon, 07 Dec 2009 05:06:00 -0000
From: Tim Gardner <tim.gardner@canonical.com>
X-Patchwork-Id: 40508
Message-Id: <4B1D19D8.8060701@canonical.com>
To: Andy Whitcroft <andy.whitcroft@canonical.com>, 
 John Johansen <john.johansen@canonical.com>
Cc: Kernel team list <kernel-team@lists.ubuntu.com>

Andy - Please pull to enable Kernel Samepage Merging.

John - Please work with the server team to ensure that they have the
correct userspace packages that make use of this functionality.

rtg


diff --git a/debian.master/config/config.common.ports b/debian.master/config/config.common.ports
index c28a6b7..b0b92d1 100644
--- a/debian.master/config/config.common.ports
+++ b/debian.master/config/config.common.ports
@@ -1590,7 +1590,7 @@ CONFIG_KS8851=m
 CONFIG_KS8851_MLL=m
 CONFIG_KS959_DONGLE=m
 CONFIG_KSDAZZLE_DONGLE=m
-# CONFIG_KSM is not set
+CONFIG_KSM=y
 CONFIG_LANMEDIA=m
 CONFIG_LAPBETHER=m
 CONFIG_LBDAF=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index b9d4326..3d4d70e 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1919,7 +1919,7 @@ CONFIG_KS8851=m
 CONFIG_KS8851_MLL=m
 CONFIG_KS959_DONGLE=m
 CONFIG_KSDAZZLE_DONGLE=m
-# CONFIG_KSM is not set
+CONFIG_KSM=y
 CONFIG_KVM=m
 CONFIG_KVM_AMD=m
 CONFIG_KVM_APIC_ARCHITECTURE=y