projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
[cascardo/linux.git]
/
arch
/
sparc
/
include
/
asm
/
cpudata_64.h
diff --git
a/arch/sparc/include/asm/cpudata_64.h
b/arch/sparc/include/asm/cpudata_64.h
index
a6cfdab
..
5b0ed48
100644
(file)
--- a/
arch/sparc/include/asm/cpudata_64.h
+++ b/
arch/sparc/include/asm/cpudata_64.h
@@
-24,9
+24,10
@@
typedef struct {
unsigned int icache_line_size;
unsigned int ecache_size;
unsigned int ecache_line_size;
unsigned int icache_line_size;
unsigned int ecache_size;
unsigned int ecache_line_size;
- unsigned short sock_id;
+ unsigned short sock_id;
/* physical package */
unsigned short core_id;
unsigned short core_id;
- int proc_id;
+ unsigned short max_cache_id; /* groupings of highest shared cache */
+ unsigned short proc_id; /* strand (aka HW thread) id */
} cpuinfo_sparc;
DECLARE_PER_CPU(cpuinfo_sparc, __cpu_data);
} cpuinfo_sparc;
DECLARE_PER_CPU(cpuinfo_sparc, __cpu_data);