From 05b4cd738cfd1771a3d5f421990d73b10779c049 Mon Sep 17 00:00:00 2001
From: Jack Steiner <steiner@sgi.com>
Date: Thu, 2 Apr 2009 16:59:48 -0700
Subject: [PATCH] --- yaml --- r: 139773 b: refs/heads/master c:
 4f032ac4122a77dbabf7a24b2739b2790448180f h: refs/heads/master i:   139771:
 c5fbe137f136b74e521ba631a82cddb5fbbc954e v: v3

---
 [refs]              | 2 +-
 trunk/lib/cpumask.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 62210187a13a..3e5293918c52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d09cde985702503970d7cc18d762fae17e1cf88
+refs/heads/master: 4f032ac4122a77dbabf7a24b2739b2790448180f
diff --git a/trunk/lib/cpumask.c b/trunk/lib/cpumask.c
index 3389e2440da0..1f71b97de0f9 100644
--- a/trunk/lib/cpumask.c
+++ b/trunk/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;