diff options
author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-06-15 21:08:07 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-06-15 21:08:07 -0400 |
commit | 7eef4091a653c243a87e5375c54504cc03bec4d8 (patch) | |
tree | f65b77f830b2c8f7d014512badfef5df0d591ee9 /ipc | |
parent | 0a93a47f042c459f0f46942c3a920e3c81878031 (diff) | |
parent | 07a2039b8eb0af4ff464efd3dfd95de5c02648c6 (diff) |
Merge commit 'v2.6.30' into for-2.6.31
Diffstat (limited to 'ipc')
-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; |