From 4160788ae857c47b9a2011b902715085ed43675b Mon Sep 17 00:00:00 2001 From: Hannes Eder Date: Sun, 23 Nov 2008 13:35:48 +0100 Subject: [PATCH] --- yaml --- r: 120793 b: refs/heads/master c: 050dc6944b9ca2186f4729ab44e0da3743933941 h: refs/heads/master i: 120791: 9890287a9276c681cb3b3e3d8988d86487f43f5f v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/cpufeature.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8c20930f1437..76c34ceb960c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49ab56ac6e1b907b7dadb72a4012460359feaf0e +refs/heads/master: 050dc6944b9ca2186f4729ab44e0da3743933941 diff --git a/trunk/arch/x86/include/asm/cpufeature.h b/trunk/arch/x86/include/asm/cpufeature.h index 694d1f8f1bee..5bce8ed02b44 100644 --- a/trunk/arch/x86/include/asm/cpufeature.h +++ b/trunk/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 */