diff options
| author | Will Deacon <will.deacon@arm.com> | 2019-05-01 15:34:17 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2019-05-01 15:34:17 +0100 |
| commit | 9431ac2bf6b742d87cdac051adc1976308070110 (patch) | |
| tree | 653c740b32bd411c2b79f81ecd6841f46814c87b /include | |
| parent | 61cf61d81e326163ce1557ceccfca76e11d0e57c (diff) | |
| parent | 427503519739e779c0db8afe876c1b33f3ac60ae (diff) | |
Merge branch 'for-next/futex' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into for-next/core
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/futex.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h index fcb61b4659b3..8666fe7f35d7 100644 --- a/include/asm-generic/futex.h +++ b/include/asm-generic/futex.h @@ -23,7 +23,9 @@ * * Return: * 0 - On success - * <0 - On error + * -EFAULT - User access resulted in a page fault + * -EAGAIN - Atomic operation was unable to complete due to contention + * -ENOSYS - Operation not supported */ static inline int arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval, u32 __user *uaddr) @@ -85,7 +87,9 @@ out_pagefault_enable: * * Return: * 0 - On success - * <0 - On error + * -EFAULT - User access resulted in a page fault + * -EAGAIN - Atomic operation was unable to complete due to contention + * -ENOSYS - Function not implemented (only if !HAVE_FUTEX_CMPXCHG) */ static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, |