git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[sfrench/cifs-2.6.git]
/
arch
/
s390
/
include
/
asm
/
topology.h
diff --git
a/arch/s390/include/asm/topology.h
b/arch/s390/include/asm/topology.h
index 6e7211abd950c8fc3e742c2ee644ca6dcd388dfe..dc8a67297d0f660c3047b8eba975350f729b886e 100644
(file)
--- a/
arch/s390/include/asm/topology.h
+++ b/
arch/s390/include/asm/topology.h
@@
-7,8
+7,10
@@
const struct cpumask *cpu_coregroup_mask(unsigned int cpu);
const struct cpumask *cpu_coregroup_mask(unsigned int cpu);
+extern unsigned char cpu_core_id[NR_CPUS];
extern cpumask_t cpu_core_map[NR_CPUS];
extern cpumask_t cpu_core_map[NR_CPUS];
+#define topology_core_id(cpu) (cpu_core_id[cpu])
#define topology_core_cpumask(cpu) (&cpu_core_map[cpu])
int topology_set_cpu_management(int fc);
#define topology_core_cpumask(cpu) (&cpu_core_map[cpu])
int topology_set_cpu_management(int fc);