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