aboutsummaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-08-01 21:11:45 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-01 21:38:00 -0700
commit6ade43fbbcc3c12f0ddba112351d14d6c82ae476 (patch)
tree1e5651082607a90345a7f042ed4937c938e11483 /ipc
parent39bbb07d7c0cf3e374831d1474e2246d9cabd931 (diff)
downloadkernel_samsung_smdk4412-6ade43fbbcc3c12f0ddba112351d14d6c82ae476.zip
kernel_samsung_smdk4412-6ade43fbbcc3c12f0ddba112351d14d6c82ae476.tar.gz
kernel_samsung_smdk4412-6ade43fbbcc3c12f0ddba112351d14d6c82ae476.tar.bz2
[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>
Diffstat (limited to 'ipc')
-rw-r--r--ipc/shm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/shm.c b/ipc/shm.c
index cce0224..1d6cf08 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