2.6.28-mmotm1230 kernel/workqueue.c compiler warning message

From: Valdis . Kletnieks
Date: Sat Jan 03 2009 - 11:37:08 EST


In mmotm1230, there was an apparent mismerge that left a spare '&' on
a variable, causing this compiler warning:

kernel/workqueue.c: In function 'wq_cpu_map':
kernel/workqueue.c:94: warning: pointer type mismatch in conditional expression

so let's fix that up.

Signed-off-by: Valdis Kletnieks <valdis.kletnieks@xxxxxx>

--- linux-2.6.28-mmotm1230/kernel/workqueue.c.dist 2009-01-01 17:23:21.000000000 -0500
+++ linux-2.6.28-mmotm1230/kernel/workqueue.c 2009-01-03 05:30:59.000000000 -0500
@@ -91,7 +91,7 @@ static inline int is_wq_single_threaded(
static const struct cpumask *wq_cpu_map(struct workqueue_struct *wq)
{
return is_wq_single_threaded(wq)
- ? get_cpu_mask(singlethread_cpu) : &cpu_populated_map;
+ ? get_cpu_mask(singlethread_cpu) : cpu_populated_map;
}

static

Attachment: pgp00000.pgp
Description: PGP signature