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 'modules-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu...
[linux-2.6-microblaze.git]
/
fs
/
userfaultfd.c
diff --git
a/fs/userfaultfd.c
b/fs/userfaultfd.c
index
19ebae4
..
f6e0f0c
100644
(file)
--- a/
fs/userfaultfd.c
+++ b/
fs/userfaultfd.c
@@
-337,7
+337,7
@@
out:
return ret;
}
return ret;
}
-static inline
long
userfaultfd_get_blocking_state(unsigned int flags)
+static inline
unsigned int
userfaultfd_get_blocking_state(unsigned int flags)
{
if (flags & FAULT_FLAG_INTERRUPTIBLE)
return TASK_INTERRUPTIBLE;
{
if (flags & FAULT_FLAG_INTERRUPTIBLE)
return TASK_INTERRUPTIBLE;
@@
-370,7
+370,7
@@
vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason)
struct userfaultfd_wait_queue uwq;
vm_fault_t ret = VM_FAULT_SIGBUS;
bool must_wait;
struct userfaultfd_wait_queue uwq;
vm_fault_t ret = VM_FAULT_SIGBUS;
bool must_wait;
-
long
blocking_state;
+
unsigned int
blocking_state;
/*
* We don't do userfault handling for the final child pid update.
/*
* We don't do userfault handling for the final child pid update.