diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-15 20:38:29 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-15 20:38:29 +0200 |
| commit | e48d199ba10bb8267f491a3a585ca4a833e950a4 (patch) | |
| tree | c7d308a42479c8f21aaef889abfa004b0f1bb482 /fs/nfs/file.c | |
| parent | [CIFS] Fix acl length when very short ACL being modified by chmod (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25 (diff) | |
| download | linux-e48d199ba10bb8267f491a3a585ca4a833e950a4.tar.xz linux-e48d199ba10bb8267f491a3a585ca4a833e950a4.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/nfs/file.c')
| -rw-r--r-- | fs/nfs/file.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index ef57a5ae5904..5d2e9d9a4e28 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -64,7 +64,11 @@ const struct file_operations nfs_file_operations = { .write = do_sync_write, .aio_read = nfs_file_read, .aio_write = nfs_file_write, +#ifdef CONFIG_MMU .mmap = nfs_file_mmap, +#else + .mmap = generic_file_mmap, +#endif .open = nfs_file_open, .flush = nfs_file_flush, .release = nfs_file_release, |