diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-10-07 11:24:24 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-07 11:24:24 +0200 |
| commit | 25a9a924c0c8723ced99179eb639e8c5372a2557 (patch) | |
| tree | 83170168d50b9703486327b5b3a0bfb1d8da9b2b /tools/testing/selftests/membarrier/membarrier_test.c | |
| parent | 0b101e62afe626ecae60173f92f1e0ec72151653 (diff) | |
| parent | a0eeb8dd34f21fddfe85b37832b5f3d02ee6e34b (diff) | |
Merge branch 'linus' into x86/asm, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/testing/selftests/membarrier/membarrier_test.c')
| -rw-r--r-- | tools/testing/selftests/membarrier/membarrier_test.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/testing/selftests/membarrier/membarrier_test.c b/tools/testing/selftests/membarrier/membarrier_test.c index dde312508007..535f0fef4d0b 100644 --- a/tools/testing/selftests/membarrier/membarrier_test.c +++ b/tools/testing/selftests/membarrier/membarrier_test.c @@ -1,9 +1,6 @@ #define _GNU_SOURCE -#define __EXPORTED_HEADERS__ - #include <linux/membarrier.h> -#include <asm-generic/unistd.h> -#include <sys/syscall.h> +#include <syscall.h> #include <stdio.h> #include <errno.h> #include <string.h> |