diff --git a/[refs] b/[refs]
index 37a178a4101d..e6d158738c8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbe31f02f5b5536f17dd978118e25052af528071
+refs/heads/master: e12f0102ac81d660c9f801d0a0e10ccf4537a9de
diff --git a/trunk/include/linux/seq_file.h b/trunk/include/linux/seq_file.h
index 952e0187ba16..40ea5058c2ec 100644
--- a/trunk/include/linux/seq_file.h
+++ b/trunk/include/linux/seq_file.h
@@ -54,7 +54,7 @@ int seq_bitmap(struct seq_file *m, const unsigned long *bits,
 				   unsigned int nr_bits);
 static inline int seq_cpumask(struct seq_file *m, const struct cpumask *mask)
 {
-	return seq_bitmap(m, mask->bits, NR_CPUS);
+	return seq_bitmap(m, mask->bits, nr_cpu_ids);
 }
 
 static inline int seq_nodemask(struct seq_file *m, nodemask_t *mask)