diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
| commit | f11cbd74c5ff3614f6390b4de67a6ffdc614c378 (patch) | |
| tree | 6a30920ade9eeaac5bf6d6263b5d09712e882eb0 /ipc | |
| parent | 429c42c9d246f5bda868495c09974312a0177328 (diff) | |
| parent | aea187c46f7d03ce985e55eb1398d0776a15b928 (diff) | |
Merge branch 'master' into for-2.6.34
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/shm.c | 3 |
1 files changed, 3 insertions, 0 deletions
| @@ -298,6 +298,9 @@ static const struct file_operations shm_file_operations = { | |||
| 298 | .mmap = shm_mmap, | 298 | .mmap = shm_mmap, |
| 299 | .fsync = shm_fsync, | 299 | .fsync = shm_fsync, |
| 300 | .release = shm_release, | 300 | .release = shm_release, |
| 301 | #ifndef CONFIG_MMU | ||
| 302 | .get_unmapped_area = shm_get_unmapped_area, | ||
| 303 | #endif | ||
| 301 | }; | 304 | }; |
| 302 | 305 | ||
| 303 | static const struct file_operations shm_file_operations_huge = { | 306 | static const struct file_operations shm_file_operations_huge = { |