diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2007-05-02 19:27:09 +0200 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2007-05-02 19:27:09 +0200 |
| commit | d824395c5994adbf7efe377cc67f732133270554 (patch) | |
| tree | 3d302ae501288f75778008ac9399e162311030ad /arch | |
| parent | 382591d500bbcd20a44416c5e0e292708468587c (diff) | |
| download | kernel_samsung_tuna-d824395c5994adbf7efe377cc67f732133270554.zip kernel_samsung_tuna-d824395c5994adbf7efe377cc67f732133270554.tar.gz kernel_samsung_tuna-d824395c5994adbf7efe377cc67f732133270554.tar.bz2 | |
[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')
| -rw-r--r-- | arch/i386/kernel/cpu/proc.c | 3 | ||||
| -rw-r--r-- | arch/x86_64/kernel/setup.c | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/i386/kernel/cpu/proc.c b/arch/i386/kernel/cpu/proc.c index 47e3ebb..89d91e6 100644 --- a/arch/i386/kernel/cpu/proc.c +++ b/arch/i386/kernel/cpu/proc.c @@ -72,8 +72,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) "stc", "100mhzsteps", "hwpstate", - NULL, - NULL, /* constant_tsc - moved to flags */ + "", /* constant_tsc - moved to flags */ /* nothing */ }; struct cpuinfo_x86 *c = v; diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index b9bdfc1..0a1d539 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 */ }; |