Merge branch 'linus' into irq/threaded

Conflicts:
	include/linux/irq.h
	kernel/irq/handle.c

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/cpumask.c b/lib/cpumask.c
index 3389e2440da0..1f71b97de0f9 100644
--- 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;