From: Andrew Morton <akpm@osdl.org>
Date: Tue, 2 Aug 2005 04:11:45 +0000 (-0700)
Subject: [PATCH] shm: CONFIG_SHMEM=n build fix
X-Git-Tag: v2.6.13-rc5~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6ade43fbbcc3c12f0ddba112351d14d6c82ae476;p=linux-2.6-omap-h63xx.git

[PATCH] shm: CONFIG_SHMEM=n build fix

Fix bug found by Grant Coady <lkml@dodo.com.au>'s autobuild setup.

shmem_set_policy() and shmem_get_policy() are macros if !CONFIG_SHMEM, so this
doesn't work.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/ipc/shm.c b/ipc/shm.c
index cce022435db..1d6cf08d950 100644
--- a/ipc/shm.c
+++ b/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