Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 240ee831187e000704cba3208ef6b0a8ad49bd64

Authored by Bryan Wu
Committed by Trond Myklebust
1 parent 66d3aac041
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

fix bug - executing FDPIC ELF on NFS mount triggers BUG() at mm/nommu.c:862:/do_mmap_private() 

NFS needs a NOMMU version mmap function to support uClinux on NOMMU machine
http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_id=141&tracker_item_id=3992

Signed-off-by: Bryan Wu <cooloney@kernel.org>
Cc: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

Showing 1 changed file with 4 additions and 0 deletions Side-by-side Diff

... ... @@ -64,7 +64,11 @@
64 64 .write = do_sync_write,
65 65 .aio_read = nfs_file_read,
66 66 .aio_write = nfs_file_write,
  67 +#ifdef CONFIG_MMU
67 68 .mmap = nfs_file_mmap,
  69 +#else
  70 + .mmap = generic_file_mmap,
  71 +#endif
68 72 .open = nfs_file_open,
69 73 .flush = nfs_file_flush,
70 74 .release = nfs_file_release,