Signed-off-by: Andrew Morton --- arch/x86_64/kernel/setup.c | 2 +- include/asm-x86_64/cpufeature.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff -puN arch/x86_64/kernel/setup.c~x86_64-mm-rdtscp-feature arch/x86_64/kernel/setup.c --- devel/arch/x86_64/kernel/setup.c~x86_64-mm-rdtscp-feature 2006-06-09 15:21:43.000000000 -0700 +++ devel-akpm/arch/x86_64/kernel/setup.c 2006-06-09 15:21:43.000000000 -0700 @@ -1206,7 +1206,7 @@ static int show_cpuinfo(struct seq_file NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, "nx", NULL, "mmxext", NULL, - NULL, "fxsr_opt", "rdtscp", NULL, NULL, "lm", "3dnowext", "3dnow", + NULL, "fxsr_opt", NULL, "rdtscp", NULL, "lm", "3dnowext", "3dnow", /* Transmeta-defined */ "recovery", "longrun", NULL, "lrti", NULL, NULL, NULL, NULL, diff -puN include/asm-x86_64/cpufeature.h~x86_64-mm-rdtscp-feature include/asm-x86_64/cpufeature.h --- devel/include/asm-x86_64/cpufeature.h~x86_64-mm-rdtscp-feature 2006-06-09 15:21:43.000000000 -0700 +++ devel-akpm/include/asm-x86_64/cpufeature.h 2006-06-09 15:21:43.000000000 -0700 @@ -46,6 +46,7 @@ #define X86_FEATURE_SYSCALL (1*32+11) /* SYSCALL/SYSRET */ #define X86_FEATURE_MMXEXT (1*32+22) /* AMD MMX extensions */ #define X86_FEATURE_FXSR_OPT (1*32+25) /* FXSR optimizations */ +#define X86_FEATURE_RDTSCP (1*32+27) /* RDTSCP */ #define X86_FEATURE_LM (1*32+29) /* Long Mode (x86-64) */ #define X86_FEATURE_3DNOWEXT (1*32+30) /* AMD 3DNow! extensions */ #define X86_FEATURE_3DNOW (1*32+31) /* 3DNow! */ _