diff options
author | Vojtech Pavlik <vojtech@suse.cz> | 2006-06-26 07:58:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 13:48:19 -0400 |
commit | 7b0e85012581a9a8b12a8191d365716bf3ca3d3c (patch) | |
tree | a8e8b5f20e910334d259f4ef8863b6a8273b3b6a | |
parent | f8bf3c65a962530821fa9a9b4bad43d8c7e13574 (diff) |
[PATCH] x86_64: Add X86_FEATURE_RDTSCP, fix rdtscp in /proc/cpuinfo
This patch adds the X86_FEATURE_RDTSCP #define, so that kernel code can
check for the feature easily and also fixes the location of the "rdtscp"
string in the cpuinfo tables.
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | arch/x86_64/kernel/setup.c | 2 | ||||
-rw-r--r-- | include/asm-x86_64/cpufeature.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index 24aa25ee0d7d..923b76fb0aa6 100644 --- a/arch/x86_64/kernel/setup.c +++ b/arch/x86_64/kernel/setup.c | |||
@@ -1206,7 +1206,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
1206 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, | 1206 | NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, |
1207 | NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL, | 1207 | NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL, |
1208 | NULL, NULL, NULL, NULL, "nx", NULL, "mmxext", NULL, | 1208 | NULL, NULL, NULL, NULL, "nx", NULL, "mmxext", NULL, |
1209 | NULL, "fxsr_opt", "rdtscp", NULL, NULL, "lm", "3dnowext", "3dnow", | 1209 | NULL, "fxsr_opt", NULL, "rdtscp", NULL, "lm", "3dnowext", "3dnow", |
1210 | 1210 | ||
1211 | /* Transmeta-defined */ | 1211 | /* Transmeta-defined */ |
1212 | "recovery", "longrun", NULL, "lrti", NULL, NULL, NULL, NULL, | 1212 | "recovery", "longrun", NULL, "lrti", NULL, NULL, NULL, NULL, |
diff --git a/include/asm-x86_64/cpufeature.h b/include/asm-x86_64/cpufeature.h index afc44e557400..fbf5a19edbb3 100644 --- a/include/asm-x86_64/cpufeature.h +++ b/include/asm-x86_64/cpufeature.h | |||
@@ -46,6 +46,7 @@ | |||
46 | #define X86_FEATURE_SYSCALL (1*32+11) /* SYSCALL/SYSRET */ | 46 | #define X86_FEATURE_SYSCALL (1*32+11) /* SYSCALL/SYSRET */ |
47 | #define X86_FEATURE_MMXEXT (1*32+22) /* AMD MMX extensions */ | 47 | #define X86_FEATURE_MMXEXT (1*32+22) /* AMD MMX extensions */ |
48 | #define X86_FEATURE_FXSR_OPT (1*32+25) /* FXSR optimizations */ | 48 | #define X86_FEATURE_FXSR_OPT (1*32+25) /* FXSR optimizations */ |
49 | #define X86_FEATURE_RDTSCP (1*32+27) /* RDTSCP */ | ||
49 | #define X86_FEATURE_LM (1*32+29) /* Long Mode (x86-64) */ | 50 | #define X86_FEATURE_LM (1*32+29) /* Long Mode (x86-64) */ |
50 | #define X86_FEATURE_3DNOWEXT (1*32+30) /* AMD 3DNow! extensions */ | 51 | #define X86_FEATURE_3DNOWEXT (1*32+30) /* AMD 3DNow! extensions */ |
51 | #define X86_FEATURE_3DNOW (1*32+31) /* 3DNow! */ | 52 | #define X86_FEATURE_3DNOW (1*32+31) /* 3DNow! */ |