diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 11:05:59 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-01 11:05:59 -0700 |
| commit | 0f8b1a0204a12441cddbbf5be31e6338e0b8da1c (patch) | |
| tree | 7a546266d24908269049bde5cb40aade4b45b06a /include/linux/mman.h | |
| parent | 928c0c1571b004917a989c4d92b09ac129ad68b2 (diff) | |
| parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
| download | op-kernel-dev-0f8b1a0204a12441cddbbf5be31e6338e0b8da1c.zip op-kernel-dev-0f8b1a0204a12441cddbbf5be31e6338e0b8da1c.tar.gz | |
Merge v3.9-rc5 into driver-core-next
We want the fixes in here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/mman.h')
| -rw-r--r-- | include/linux/mman.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/mman.h b/include/linux/mman.h index 61c7a87..9aa863d 100644 --- a/include/linux/mman.h +++ b/include/linux/mman.h @@ -79,8 +79,6 @@ calc_vm_flag_bits(unsigned long flags) { return _calc_vm_trans(flags, MAP_GROWSDOWN, VM_GROWSDOWN ) | _calc_vm_trans(flags, MAP_DENYWRITE, VM_DENYWRITE ) | - ((flags & MAP_LOCKED) ? (VM_LOCKED | VM_POPULATE) : 0) | - (((flags & (MAP_POPULATE | MAP_NONBLOCK)) == MAP_POPULATE) ? - VM_POPULATE : 0); + _calc_vm_trans(flags, MAP_LOCKED, VM_LOCKED ); } #endif /* _LINUX_MMAN_H */ |
