diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
| commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
| tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /include/asm-mips/futex.h | |
| parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
| download | kernel_samsung_smdk4412-95d465fd750897ab32462a6702fbfe1b122cbbc0.zip kernel_samsung_smdk4412-95d465fd750897ab32462a6702fbfe1b122cbbc0.tar.gz kernel_samsung_smdk4412-95d465fd750897ab32462a6702fbfe1b122cbbc0.tar.bz2 | |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
Diffstat (limited to 'include/asm-mips/futex.h')
| -rw-r--r-- | include/asm-mips/futex.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-mips/futex.h b/include/asm-mips/futex.h index 2454c44..a554089 100644 --- a/include/asm-mips/futex.h +++ b/include/asm-mips/futex.h @@ -99,5 +99,11 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr) return ret; } +static inline int +futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval) +{ + return -ENOSYS; +} + #endif #endif |