Title: [7342] trunk/ipc/shm.c: merge ipc hugepage fix that was merged into mainline
- Revision
- 7342
- Author
- vapier
- Date
- 2009-09-15 19:54:18 -0400 (Tue, 15 Sep 2009)
Log Message
merge ipc hugepage fix that was merged into mainline
Modified Paths
Diff
Modified: trunk/ipc/shm.c (7341 => 7342)
--- trunk/ipc/shm.c 2009-09-15 09:47:05 UTC (rev 7341)
+++ trunk/ipc/shm.c 2009-09-15 23:54:18 UTC (rev 7342)
@@ -410,10 +410,8 @@
return error;
no_id:
-#ifdef CONFIG_HUGETLB_PAGE
- if (shp->mlock_user) /* shmflg & SHM_HUGETLB case */
+ if (is_file_hugepages(file) && shp->mlock_user)
user_shm_unlock(size, shp->mlock_user);
-#endif
fput(file);
no_file:
security_shm_free(shp);
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
