[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>

2 files changed, 3 insertions, 5 deletions

diff --git a/arch/i386/kernel/cpu/proc.c b/arch/i386/kernel/cpu/proc.c
index 47e3ebbfb28d..89d91e6cc972 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 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 */
         };