Re: [PATCH] cputopology: Always define CPU topology information [5th try]

[Ingo Molnar <mingo@elte.hu>]

* Ben Hutchings <bhutchings@solarflare.com> wrote:

> > > This patch:
> > > 
> > > - Adds default definitions of the 4 topology macros to <linux/topology.h>
> > > - Changes drivers/base/topology.c to use the topology macros unconditionally
> > > - Updates documentation accordingly
> > 
> > applied to tip/core/topology - thanks Ben.
> 
> Unfortunately you lost the first paragraph of the commit message, then 
> created a second commit (difference between 4th and 5th versions) with 
> your own commit message and me as the author.  Maybe it's nitpicking 
> but I would prefer to have strictly accurate metadata in the commit 
> log.

that's OK, see the delta patch below, it's rather trivial. It's better 
to do these small delta patches where each change stands on its own than 
to review a more complex combo patch. (Suggest me any other commit 
metadata for this delta if you prefer, we can still change it.)

	Ingo

-------------->
commit 131b943ae643b1ad6febd67cdbb31d955706ecf4
Author: Ben Hutchings <bhutchings@solarflare.com>
Date:   Thu Jun 5 17:37:15 2008 +0100

    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 24d29a9..f0cb270 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)		\