From a70e4872c371c52967ff5486d554826a8b26d24a Mon Sep 17 00:00:00 2001
From: Kolan Sh <backbone@backbone.ws>
Date: Tue, 30 Sep 2014 19:17:14 +0400
Subject: [PATCH] nickolay-842: enabled UKSM

---
 .config.nickolay-842 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.config.nickolay-842 b/.config.nickolay-842
index d3a41b1..9a77f25 100644
--- a/.config.nickolay-842
+++ b/.config.nickolay-842
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.16.3-backbone Kernel Configuration
+# Linux/x86 3.16.3-backbone-r1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -426,6 +426,8 @@ CONFIG_ZONE_DMA_FLAG=1
 CONFIG_VIRT_TO_BUS=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
+CONFIG_UKSM=y
+# CONFIG_KSM_LEGACY is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 # CONFIG_MEMORY_FAILURE is not set