From: Ben Hutchings <bhutchings@solarflare.com>
Date: Thu, 5 Jun 2008 16:37:15 +0000 (+0100)
Subject: cputopology: always define CPU topology information, clean up
X-Git-Tag: v2.6.27-rc1~1084^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=131b943ae643b1ad6febd67cdbb31d955706ecf4;p=linux-2.6

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>
---

diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index 24d29a9fc2..f0cb270119 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)		\