Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6

[linux-2.6-omap-h63xx.git] / lib / cpumask.c

diff --git a/lib/cpumask.c b/lib/cpumask.c
index 3389e2440da0f30a76d49ab63f3419bce857849b..1f71b97de0f945e9cd59c264e87c1148aa74cf33 100644 (file)
--- a/lib/cpumask.c
+++ b/lib/cpumask.c
@@ -109,10 +109,10 @@ bool alloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags, int node)
 #endif
        /* FIXME: Bandaid to save us from old primitives which go to NR_CPUS. */
        if (*mask) {
+               unsigned char *ptr = (unsigned char *)cpumask_bits(*mask);
                unsigned int tail;
                tail = BITS_TO_LONGS(NR_CPUS - nr_cpumask_bits) * sizeof(long);
-               memset(cpumask_bits(*mask) + cpumask_size() - tail,
-                      0, tail);
+               memset(ptr + cpumask_size() - tail, 0, tail);
        }
 
        return *mask != NULL;