diff options
| author |   Hannes Eder <hannes@hanneseder.net> | 2008-11-23 13:35:48 +0100 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-11-23 13:38:50 +0100 |
| commit | 050dc6944b9ca2186f4729ab44e0da3743933941 (patch) | |
| tree | f86cea9c9db45fe5c80473dceef7ac12e9e1c58f /arch/x86/include/asm/cpufeature.h | |
| parent | x86: add X86_FEATURE_HYPERVISOR feature bit (diff) | |
| download | linux-dev-050dc6944b9ca2186f4729ab44e0da3743933941.tar.xz linux-dev-050dc6944b9ca2186f4729ab44e0da3743933941.zip | |
x86: remove duplicate #define from 'cpufeature.h'
Impact: cleanup
Remove duplicate #define from 'cpufeature.h'.
This also fixes the following sparse warning:
arch/x86/kernel/cpu/capflags.c:54:3: warning: Initializer entry defined twice
arch/x86/kernel/cpu/capflags.c:58:3: also defined here
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/cpufeature.h')
| -rw-r--r-- | arch/x86/include/asm/cpufeature.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index 694d1f8f1bee..5bce8ed02b44 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -80,7 +80,6 @@ #define X86_FEATURE_UP (3*32+ 9) /* smp kernel running on up */ #define X86_FEATURE_FXSAVE_LEAK (3*32+10) /* "" FXSAVE leaks FOP/FIP/FOP */ #define X86_FEATURE_ARCH_PERFMON (3*32+11) /* Intel Architectural PerfMon */ -#define X86_FEATURE_NOPL (3*32+20) /* The NOPL (0F 1F) instructions */ #define X86_FEATURE_PEBS (3*32+12) /* Precise-Event Based Sampling */ #define X86_FEATURE_BTS (3*32+13) /* Branch Trace Store */ #define X86_FEATURE_SYSCALL32 (3*32+14) /* "" syscall in ia32 userspace */ |