diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-04-15 09:57:50 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-04-15 09:57:50 +0800 |
| commit | dc65fae3f730b6a1888f5559d68e59111f013c4f (patch) | |
| tree | 019e33c310553116b5b64042820bfb007b0fa832 /include/linux/futex.h | |
| parent | 5ad6d9ba813e2a36b624970f7e5beb4e12641bee (diff) | |
| parent | f512eefd5cde0ad21bd99bbfe4dc70b62805838e (diff) | |
Merge tag 'v3.10.37' into linux-linaro-lsk
This is the 3.10.37 stable release
Diffstat (limited to 'include/linux/futex.h')
| -rw-r--r-- | include/linux/futex.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/futex.h b/include/linux/futex.h index b0d95cac826e..6435f46d6e13 100644 --- a/include/linux/futex.h +++ b/include/linux/futex.h @@ -55,7 +55,11 @@ union futex_key { #ifdef CONFIG_FUTEX extern void exit_robust_list(struct task_struct *curr); extern void exit_pi_state_list(struct task_struct *curr); +#ifdef CONFIG_HAVE_FUTEX_CMPXCHG +#define futex_cmpxchg_enabled 1 +#else extern int futex_cmpxchg_enabled; +#endif #else static inline void exit_robust_list(struct task_struct *curr) { |