From 5f4646acb9b10e5bccc6d0194ed5254261706d85 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Wed, 2 May 2007 19:27:09 +0200
Subject: [PATCH] --- yaml --- r: 53797 b: refs/heads/master c:
 d824395c5994adbf7efe377cc67f732133270554 h: refs/heads/master i:   53795:
 7999268e30196709f0e70dfa0e73e553cb5db4a8 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/i386/kernel/cpu/proc.c | 3 +--
 trunk/arch/x86_64/kernel/setup.c  | 5 ++---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 7b232aa83bd8..b7cf169ba143 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 382591d500bbcd20a44416c5e0e292708468587c
+refs/heads/master: d824395c5994adbf7efe377cc67f732133270554
diff --git a/trunk/arch/i386/kernel/cpu/proc.c b/trunk/arch/i386/kernel/cpu/proc.c
index 47e3ebbfb28d..89d91e6cc972 100644
--- a/trunk/arch/i386/kernel/cpu/proc.c
+++ b/trunk/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/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c
index b9bdfc1b54f8..0a1d539149df 100644
--- a/trunk/arch/x86_64/kernel/setup.c
+++ b/trunk/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 */
 	};