summaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/setup.c
diff options
context:
space:
mode:
authorJoerg Roedel2007-05-02 19:27:09 +0200
committerAndi Kleen2007-05-02 19:27:09 +0200
commitd824395c5994adbf7efe377cc67f732133270554 (patch)
tree3d302ae501288f75778008ac9399e162311030ad /arch/x86_64/kernel/setup.c
parent[PATCH] x86-64: fixed size remaining fake nodes (diff)
downloadkernel-qcow2-linux-d824395c5994adbf7efe377cc67f732133270554.tar.gz
kernel-qcow2-linux-d824395c5994adbf7efe377cc67f732133270554.tar.xz
kernel-qcow2-linux-d824395c5994adbf7efe377cc67f732133270554.zip
[PATCH] x86: remove constant_tsc reporting from /proc/cpuinfo' power flags
remove the reporting of the constant_tsc flag from the "power management" field in /proc/cpuinfo. The NULL value there was replaced by "" because the former would result in a printout of [8] if the flag is set. Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64/kernel/setup.c')
-rw-r--r--arch/x86_64/kernel/setup.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index b9bdfc1b54f8..0a1d539149df 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -979,9 +979,8 @@ static int show_cpuinfo(struct seq_file *m, void *v)
"stc",
"100mhzsteps",
"hwpstate",
- NULL, /* tsc invariant mapped to constant_tsc */
- NULL,
- /* nothing */ /* constant_tsc - moved to flags */
+ "", /* tsc invariant mapped to constant_tsc */
+ /* nothing */
};