diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-08-09 10:56:33 -0400 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-08-09 10:56:33 -0400 |
| commit | 840b49ba554b40fa8301ad2716abd2fe3d9e382a (patch) | |
| tree | 18446a7f1d5ff5e25a0eff706b65af4908bc02ee | |
| parent | 791cceb89f7987c0375ff2e8971928a47f62ccae (diff) | |
tools: Sync cpufeatures headers with the kernel
Due to:
1e61f78baf89 ("x86/cpufeature: Make sure DISABLED/REQUIRED macros are updated")
No changes to tools using those headers (tools/arch/x86/lib/mem{set,cpu}_64.S)
seems necessary.
Detected by the tools build header drift checker:
$ make -C tools/perf O=/tmp/build/perf
make: Entering directory '/home/acme/git/linux/tools/perf'
BUILD: Doing 'make -j4' parallel build
GEN /tmp/build/perf/common-cmds.h
Warning: tools/arch/x86/include/asm/disabled-features.h differs from kernel
Warning: tools/arch/x86/include/asm/required-features.h differs from kernel
Warning: tools/arch/x86/include/asm/cpufeatures.h differs from kernel
CC /tmp/build/perf/util/probe-finder.o
CC /tmp/build/perf/builtin-help.o
<SNIP>
^C$
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-ja75m7zk8j0jkzmrv16i5ehw@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
| -rw-r--r-- | tools/arch/x86/include/asm/disabled-features.h | 2 | ||||
| -rw-r--r-- | tools/arch/x86/include/asm/required-features.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tools/arch/x86/include/asm/disabled-features.h b/tools/arch/x86/include/asm/disabled-features.h index 911e9358ceb1..85599ad4d024 100644 --- a/tools/arch/x86/include/asm/disabled-features.h +++ b/tools/arch/x86/include/asm/disabled-features.h | |||
| @@ -56,5 +56,7 @@ | |||
| 56 | #define DISABLED_MASK14 0 | 56 | #define DISABLED_MASK14 0 |
| 57 | #define DISABLED_MASK15 0 | 57 | #define DISABLED_MASK15 0 |
| 58 | #define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE) | 58 | #define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE) |
| 59 | #define DISABLED_MASK17 0 | ||
| 60 | #define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 18) | ||
| 59 | 61 | ||
| 60 | #endif /* _ASM_X86_DISABLED_FEATURES_H */ | 62 | #endif /* _ASM_X86_DISABLED_FEATURES_H */ |
diff --git a/tools/arch/x86/include/asm/required-features.h b/tools/arch/x86/include/asm/required-features.h index 4916144e3c42..fac9a5c0abe9 100644 --- a/tools/arch/x86/include/asm/required-features.h +++ b/tools/arch/x86/include/asm/required-features.h | |||
| @@ -99,5 +99,7 @@ | |||
| 99 | #define REQUIRED_MASK14 0 | 99 | #define REQUIRED_MASK14 0 |
| 100 | #define REQUIRED_MASK15 0 | 100 | #define REQUIRED_MASK15 0 |
| 101 | #define REQUIRED_MASK16 0 | 101 | #define REQUIRED_MASK16 0 |
| 102 | #define REQUIRED_MASK17 0 | ||
| 103 | #define REQUIRED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 18) | ||
| 102 | 104 | ||
| 103 | #endif /* _ASM_X86_REQUIRED_FEATURES_H */ | 105 | #endif /* _ASM_X86_REQUIRED_FEATURES_H */ |