projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'acpi-5.13-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[linux-2.6-microblaze.git]
/
mm
/
mlock.c
diff --git
a/mm/mlock.c
b/mm/mlock.c
index
f8f8cc3
..
df590fd
100644
(file)
--- a/
mm/mlock.c
+++ b/
mm/mlock.c
@@
-559,7
+559,7
@@
static int apply_vma_lock_flags(unsigned long start, size_t len,
vm_flags_t flags)
{
unsigned long nstart, end, tmp;
vm_flags_t flags)
{
unsigned long nstart, end, tmp;
- struct vm_area_struct *
vma, *
prev;
+ struct vm_area_struct *
vma, *
prev;
int error;
VM_BUG_ON(offset_in_page(start));
int error;
VM_BUG_ON(offset_in_page(start));
@@
-737,7
+737,7
@@
SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
*/
static int apply_mlockall_flags(int flags)
{
*/
static int apply_mlockall_flags(int flags)
{
- struct vm_area_struct *
vma, *
prev = NULL;
+ struct vm_area_struct *
vma, *
prev = NULL;
vm_flags_t to_add = 0;
current->mm->def_flags &= VM_LOCKED_CLEAR_MASK;
vm_flags_t to_add = 0;
current->mm->def_flags &= VM_LOCKED_CLEAR_MASK;