|
@@ -670,8 +670,6 @@ static __must_check int do_mlock(unsigned long start, size_t len, vm_flags_t fla
|
|
if (!can_do_mlock())
|
|
if (!can_do_mlock())
|
|
return -EPERM;
|
|
return -EPERM;
|
|
|
|
|
|
- lru_add_drain_all(); /* flush pagevec */
|
|
|
|
-
|
|
|
|
len = PAGE_ALIGN(len + (offset_in_page(start)));
|
|
len = PAGE_ALIGN(len + (offset_in_page(start)));
|
|
start &= PAGE_MASK;
|
|
start &= PAGE_MASK;
|
|
|
|
|
|
@@ -798,9 +796,6 @@ SYSCALL_DEFINE1(mlockall, int, flags)
|
|
if (!can_do_mlock())
|
|
if (!can_do_mlock())
|
|
return -EPERM;
|
|
return -EPERM;
|
|
|
|
|
|
- if (flags & MCL_CURRENT)
|
|
|
|
- lru_add_drain_all(); /* flush pagevec */
|
|
|
|
-
|
|
|
|
lock_limit = rlimit(RLIMIT_MEMLOCK);
|
|
lock_limit = rlimit(RLIMIT_MEMLOCK);
|
|
lock_limit >>= PAGE_SHIFT;
|
|
lock_limit >>= PAGE_SHIFT;
|
|
|
|
|