aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/i386/kernel/cpu/proc.c3
-rw-r--r--arch/x86_64/kernel/setup.c5
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)
72 "stc", 72 "stc",
73 "100mhzsteps", 73 "100mhzsteps",
74 "hwpstate", 74 "hwpstate",
75 NULL, 75 "", /* constant_tsc - moved to flags */
76 NULL, /* constant_tsc - moved to flags */
77 /* nothing */ 76 /* nothing */
78 }; 77 };
79 struct cpuinfo_x86 *c = v; 78 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)
979 "stc", 979 "stc",
980 "100mhzsteps", 980 "100mhzsteps",
981 "hwpstate", 981 "hwpstate",
982 NULL, /* tsc invariant mapped to constant_tsc */ 982 "", /* tsc invariant mapped to constant_tsc */
983 NULL, 983 /* nothing */
984 /* nothing */ /* constant_tsc - moved to flags */
985 }; 984 };
986 985
987 986