diff options
Diffstat (limited to 'arch/i386/kernel/cpu/proc.c')
-rw-r--r-- | arch/i386/kernel/cpu/proc.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/i386/kernel/cpu/proc.c b/arch/i386/kernel/cpu/proc.c index 0f1125b15b76..4f28eba7fb8a 100644 --- a/arch/i386/kernel/cpu/proc.c +++ b/arch/i386/kernel/cpu/proc.c | |||
@@ -98,6 +98,8 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
98 | seq_printf(m, "physical id\t: %d\n", phys_proc_id[n]); | 98 | seq_printf(m, "physical id\t: %d\n", phys_proc_id[n]); |
99 | seq_printf(m, "siblings\t: %d\n", | 99 | seq_printf(m, "siblings\t: %d\n", |
100 | c->x86_num_cores * smp_num_siblings); | 100 | c->x86_num_cores * smp_num_siblings); |
101 | seq_printf(m, "core id\t\t: %d\n", cpu_core_id[n]); | ||
102 | seq_printf(m, "cpu cores\t: %d\n", c->x86_num_cores); | ||
101 | } | 103 | } |
102 | #endif | 104 | #endif |
103 | 105 | ||
@@ -130,13 +132,6 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
130 | c->loops_per_jiffy/(500000/HZ), | 132 | c->loops_per_jiffy/(500000/HZ), |
131 | (c->loops_per_jiffy/(5000/HZ)) % 100); | 133 | (c->loops_per_jiffy/(5000/HZ)) % 100); |
132 | 134 | ||
133 | #ifdef CONFIG_SMP | ||
134 | /* Put new fields at the end to lower the probability of | ||
135 | breaking user space parsers. */ | ||
136 | seq_printf(m, "core id\t\t: %d\n", cpu_core_id[n]); | ||
137 | seq_printf(m, "cpu cores\t: %d\n", c->x86_num_cores); | ||
138 | #endif | ||
139 | |||
140 | return 0; | 135 | return 0; |
141 | } | 136 | } |
142 | 137 | ||