From 582983ea7047596a8bd411235b69696a1165bad3 Mon Sep 17 00:00:00 2001 From: Vojtech Pavlik Date: Mon, 26 Jun 2006 13:58:26 +0200 Subject: [PATCH] --- yaml --- r: 30495 b: refs/heads/master c: 7b0e85012581a9a8b12a8191d365716bf3ca3d3c h: refs/heads/master i: 30493: 371d1fafef8d4febf726912ab10172df8533d429 30491: 3394ee7bbe8da8fe6d1afd85ca99d8344ecb634d 30487: 1b47bde2ce81c4ecbc7bf93108da99e649f46c9e 30479: e5eb5904cc1566593dc85f1a2b4199bc5378ef58 30463: cefa3af1ae482653002ca7589f72a990fd73f898 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/setup.c | 2 +- trunk/include/asm-x86_64/cpufeature.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 122cb71bb72b..6303a5fbc75c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8bf3c65a962530821fa9a9b4bad43d8c7e13574 +refs/heads/master: 7b0e85012581a9a8b12a8191d365716bf3ca3d3c diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c index 24aa25ee0d7d..923b76fb0aa6 100644 --- a/trunk/arch/x86_64/kernel/setup.c +++ b/trunk/arch/x86_64/kernel/setup.c @@ -1206,7 +1206,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) 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 --git a/trunk/include/asm-x86_64/cpufeature.h b/trunk/include/asm-x86_64/cpufeature.h index afc44e557400..fbf5a19edbb3 100644 --- a/trunk/include/asm-x86_64/cpufeature.h +++ b/trunk/include/asm-x86_64/cpufeature.h @@ -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! */