From 914be71160bdbf67cae493fbab2453776381ffb4 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hughd@google.com>
Date: Fri, 8 Mar 2013 12:43:34 -0800
Subject: [PATCH] --- yaml --- r: 360984 b: refs/heads/master c:
 d8fc16a825eb7780db71268a8502fb3e6af95753 h: refs/heads/master v: v3

---
 [refs]         | 2 +-
 trunk/mm/ksm.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1bb076e3fc1d..8220284b5c73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a40e7cf8f06b4e322ba902e4e9f6a6b0c2daa907
+refs/heads/master: d8fc16a825eb7780db71268a8502fb3e6af95753
diff --git a/trunk/mm/ksm.c b/trunk/mm/ksm.c
index 85bfd4c16346..b6afe0c440d8 100644
--- a/trunk/mm/ksm.c
+++ b/trunk/mm/ksm.c
@@ -489,7 +489,7 @@ out:		page = NULL;
  */
 static inline int get_kpfn_nid(unsigned long kpfn)
 {
-	return ksm_merge_across_nodes ? 0 : pfn_to_nid(kpfn);
+	return ksm_merge_across_nodes ? 0 : NUMA(pfn_to_nid(kpfn));
 }
 
 static void remove_node_from_stable_tree(struct stable_node *stable_node)