diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-30 10:40:21 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-30 10:40:21 +1100 |
| commit | 6504b17263e759d37295406fba245c5cb17eaff9 (patch) | |
| tree | e927e19538419d0da0f26af6fecf2e97e994a48a /fs | |
| parent | fa81dd44154ad4d1e22d14d330d307556849c387 (diff) | |
| parent | 699bbe452950704ef52d5294def9275ddcbec31f (diff) | |
Merge remote branch 'kvm/linux-next'
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ncpfs/mmap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ncpfs/mmap.c b/fs/ncpfs/mmap.c index 56f5b3a0e1ee..b9c4f362a88f 100644 --- a/fs/ncpfs/mmap.c +++ b/fs/ncpfs/mmap.c @@ -39,6 +39,8 @@ static int ncp_file_mmap_fault(struct vm_area_struct *area, int bufsize; int pos; /* XXX: loff_t ? */ + if (vmf->flags & FAULT_FLAG_MINOR) + return VM_FAULT_MAJOR | VM_FAULT_ERROR; /* * ncpfs has nothing against high pages as long * as recvmsg and memset works on it |