projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
arch
/
i386
/
kernel
/
cpu
/
proc.c
diff --git
a/arch/i386/kernel/cpu/proc.c
b/arch/i386/kernel/cpu/proc.c
index
4b03f9f
..
76aac08
100644
(file)
--- a/
arch/i386/kernel/cpu/proc.c
+++ b/
arch/i386/kernel/cpu/proc.c
@@
-46,8
+46,8
@@
static int show_cpuinfo(struct seq_file *m, void *v)
/* Intel-defined (#2) */
"pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "est",
/* Intel-defined (#2) */
"pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "est",
- "tm2",
NULL
, "cid", NULL, NULL, "cx16", "xtpr", NULL,
- NULL, NULL,
NULL
, NULL, NULL, NULL, NULL, NULL,
+ "tm2",
"ssse3"
, "cid", NULL, NULL, "cx16", "xtpr", NULL,
+ NULL, NULL,
"dca"
, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* VIA/Cyrix/Centaur-defined */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
/* VIA/Cyrix/Centaur-defined */
@@
-109,9
+109,9
@@
static int show_cpuinfo(struct seq_file *m, void *v)
seq_printf(m, "cache size\t: %d KB\n", c->x86_cache_size);
#ifdef CONFIG_X86_HT
if (c->x86_max_cores * smp_num_siblings > 1) {
seq_printf(m, "cache size\t: %d KB\n", c->x86_cache_size);
#ifdef CONFIG_X86_HT
if (c->x86_max_cores * smp_num_siblings > 1) {
- seq_printf(m, "physical id\t: %d\n",
phys_proc_id[n]
);
+ seq_printf(m, "physical id\t: %d\n",
c->phys_proc_id
);
seq_printf(m, "siblings\t: %d\n", cpus_weight(cpu_core_map[n]));
seq_printf(m, "siblings\t: %d\n", cpus_weight(cpu_core_map[n]));
- seq_printf(m, "core id\t\t: %d\n", c
pu_core_id[n]
);
+ seq_printf(m, "core id\t\t: %d\n", c
->cpu_core_id
);
seq_printf(m, "cpu cores\t: %d\n", c->booted_cores);
}
#endif
seq_printf(m, "cpu cores\t: %d\n", c->booted_cores);
}
#endif