diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-11 17:51:46 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-11 17:51:46 -0500 |
commit | cbefa3258eade263dbc9ae2c1f1ea2ca96e6b457 (patch) | |
tree | 51f012ef93cc828be4eb693c0ced0503217d1025 /ipc/shm.c | |
parent | 489ff4c7d167be954f715128790bd80d3c888322 (diff) | |
parent | 25bf368b3d98668c5d5f38e2201d8bca16e52680 (diff) |
Merge branch 'master'
Diffstat (limited to 'ipc/shm.c')
-rw-r--r-- | ipc/shm.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -870,6 +870,7 @@ asmlinkage long sys_shmdt(char __user *shmaddr) | |||
870 | * could possibly have landed at. Also cast things to loff_t to | 870 | * could possibly have landed at. Also cast things to loff_t to |
871 | * prevent overflows and make comparisions vs. equal-width types. | 871 | * prevent overflows and make comparisions vs. equal-width types. |
872 | */ | 872 | */ |
873 | size = PAGE_ALIGN(size); | ||
873 | while (vma && (loff_t)(vma->vm_end - addr) <= size) { | 874 | while (vma && (loff_t)(vma->vm_end - addr) <= size) { |
874 | next = vma->vm_next; | 875 | next = vma->vm_next; |
875 | 876 | ||