diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-06-09 19:26:23 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-09 19:59:03 -0400 |
commit | 586c7e6a280580fd94b662bf486f9bb31098d14b (patch) | |
tree | 27547e0dc35c34431f9504ad51b70ccccc55c14f | |
parent | 13df635f080d411a152c92087a384135c1562fac (diff) |
shm: fix unused warnings on nommu
The massive nommu update (8feae131) resulted in these warnings:
ipc/shm.c: In function `sys_shmdt':
ipc/shm.c:974: warning: unused variable `size'
ipc/shm.c:972: warning: unused variable `next'
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | ipc/shm.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -969,10 +969,13 @@ SYSCALL_DEFINE3(shmat, int, shmid, char __user *, shmaddr, int, shmflg) | |||
969 | SYSCALL_DEFINE1(shmdt, char __user *, shmaddr) | 969 | SYSCALL_DEFINE1(shmdt, char __user *, shmaddr) |
970 | { | 970 | { |
971 | struct mm_struct *mm = current->mm; | 971 | struct mm_struct *mm = current->mm; |
972 | struct vm_area_struct *vma, *next; | 972 | struct vm_area_struct *vma; |
973 | unsigned long addr = (unsigned long)shmaddr; | 973 | unsigned long addr = (unsigned long)shmaddr; |
974 | loff_t size = 0; | ||
975 | int retval = -EINVAL; | 974 | int retval = -EINVAL; |
975 | #ifdef CONFIG_MMU | ||
976 | loff_t size = 0; | ||
977 | struct vm_area_struct *next; | ||
978 | #endif | ||
976 | 979 | ||
977 | if (addr & ~PAGE_MASK) | 980 | if (addr & ~PAGE_MASK) |
978 | return retval; | 981 | return retval; |