gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of pccluster.org:mckernel into development

Browse Source
This commit is contained in:
Tomoki Shirasawa
2017-11-22 10:53:33 +09:00
parent d273a2f58b 4e7069d499
commit c9fa445f54
46 changed files with 460 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86_64/kernel/include/arch-futex.h
View File

@@ -64,7 +64,6 @@ static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval,
return oldval;
}
#ifdef POSTK_DEBUG_ARCH_DEP_8 /* arch depend hide */
static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
{
int op = (encoded_op >> 28) & 7;
@@ -128,7 +127,6 @@ static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
}
return ret;
}
#endif /* !POSTK_DEBUG_ARCH_DEP_8 */
static inline int get_futex_value_locked(uint32_t *dest, uint32_t *from)
{