From 56bcc2bdba6eb64a16188704e0857474f52c4519 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Mon, 1 Aug 2005 21:11:45 -0700
Subject: [PATCH] --- yaml --- r: 5583 b: refs/heads/master c:
 6ade43fbbcc3c12f0ddba112351d14d6c82ae476 h: refs/heads/master i:   5581:
 a9e8610f86c73dd3f5dc27cae23196f8b9e71fbd   5579:
 a5346ea0870ce79940108eb0a71f9333105cd4df   5575:
 2c73febd4255f80f794ca4d43153bdb72dbe17aa   5567:
 c22937aae7361af80e3f35a03318224b92ebd1f2 v: v3

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

diff --git a/[refs] b/[refs]
index 8fb00c4989a2..9eaf9e8c4376 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39bbb07d7c0cf3e374831d1474e2246d9cabd931
+refs/heads/master: 6ade43fbbcc3c12f0ddba112351d14d6c82ae476
diff --git a/trunk/ipc/shm.c b/trunk/ipc/shm.c
index cce022435dbc..1d6cf08d950b 100644
--- a/trunk/ipc/shm.c
+++ b/trunk/ipc/shm.c
@@ -170,7 +170,7 @@ static struct vm_operations_struct shm_vm_ops = {
 	.open	= shm_open,	/* callback for a new vm-area open */
 	.close	= shm_close,	/* callback for when the vm-area is released */
 	.nopage	= shmem_nopage,
-#ifdef CONFIG_NUMA
+#if defined(CONFIG_NUMA) && defined(CONFIG_SHMEM)
 	.set_policy = shmem_set_policy,
 	.get_policy = shmem_get_policy,
 #endif