diff --git a/[refs] b/[refs]
index b6b882f3d84f..1832dd81029e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ae11b278bca1cd41651bae49a8c69de2f6a6262
+refs/heads/master: c1e6c8d074ea3621106548654cc244d2edc12ead
diff --git a/trunk/include/linux/nodemask.h b/trunk/include/linux/nodemask.h
index ca9b489a27f8..cbd521a03127 100644
--- a/trunk/include/linux/nodemask.h
+++ b/trunk/include/linux/nodemask.h
@@ -245,14 +245,19 @@ static inline int __next_node(int n, const nodemask_t *srcp)
 	return min_t(int,MAX_NUMNODES,find_next_bit(srcp->bits, MAX_NUMNODES, n+1));
 }
 
+static inline void init_nodemask_of_node(nodemask_t *mask, int node)
+{
+	nodes_clear(*mask);
+	node_set(node, *mask);
+}
+
 #define nodemask_of_node(node)						\
 ({									\
 	typeof(_unused_nodemask_arg_) m;				\
 	if (sizeof(m) == sizeof(unsigned long)) {			\
-		m.bits[0] = 1UL<<(node);				\
+		m.bits[0] = 1UL << (node);				\
 	} else {							\
-		nodes_clear(m);						\
-		node_set((node), m);					\
+		init_nodemask_of_node(&m, (node));			\
 	}								\
 	m;								\
 })