Explorar el Código

[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>
Joerg Roedel hace 18 años
padre
commit
d824395c59
Se han modificado 2 ficheros con 3 adiciones y 5 borrados
  1. 1 2
      arch/i386/kernel/cpu/proc.c
  2. 2 3
      arch/x86_64/kernel/setup.c

+ 1 - 2
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;

+ 2 - 3
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 */
 	};