summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2008-06-05 17:37:15 +0100
committerIngo Molnar <mingo@elte.hu>2008-06-13 10:10:20 +0200
commit131b943ae643b1ad6febd67cdbb31d955706ecf4 (patch)
tree79c0204d241b5b6dab689d776fa33df9fe8f56b6
parentc50cbb05a05cf1f9ca3592272eff053c847727d8 (diff)
cputopology: always define CPU topology information, clean up
simplify drivers/base/topology.c a bit. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--drivers/base/topology.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index 24d29a9fc25..f0cb2701193 100644
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
@@ -59,16 +59,14 @@ static ssize_t show_cpumap(int type, cpumask_t *mask, char *buf)
static inline ssize_t show_##name(struct sys_device *dev, char *buf) \
{ \
unsigned int cpu = dev->id; \
- cpumask_t siblings = topology_##name(cpu); \
- return show_cpumap(0, &siblings, buf); \
+ return show_cpumap(0, &(topology_##name(cpu)), buf); \
}
#define define_siblings_show_list(name) \
static inline ssize_t show_##name##_list(struct sys_device *dev, char *buf) \
{ \
unsigned int cpu = dev->id; \
- cpumask_t siblings = topology_##name(cpu); \
- return show_cpumap(1, &siblings, buf); \
+ return show_cpumap(1, &(topology_##name(cpu)), buf); \
}
#define define_siblings_show_func(name) \