diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/asm-x86/futex.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-x86/futex.h')
| -rw-r--r-- | include/asm-x86/futex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86/futex.h b/include/asm-x86/futex.h index ac0fbf24d722..e7a76b37b333 100644 --- a/include/asm-x86/futex.h +++ b/include/asm-x86/futex.h | |||
| @@ -4,12 +4,12 @@ | |||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | 5 | ||
| 6 | #include <linux/futex.h> | 6 | #include <linux/futex.h> |
| 7 | #include <linux/uaccess.h> | ||
| 7 | 8 | ||
| 8 | #include <asm/asm.h> | 9 | #include <asm/asm.h> |
| 9 | #include <asm/errno.h> | 10 | #include <asm/errno.h> |
| 10 | #include <asm/processor.h> | 11 | #include <asm/processor.h> |
| 11 | #include <asm/system.h> | 12 | #include <asm/system.h> |
| 12 | #include <asm/uaccess.h> | ||
| 13 | 13 | ||
| 14 | #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \ | 14 | #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \ |
| 15 | asm volatile("1:\t" insn "\n" \ | 15 | asm volatile("1:\t" insn "\n" \ |