diff --git a/[refs] b/[refs]
index cccefea9454f..fcfd903b3108 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01c2475f6d959ed3beb9ce1b0bc6f8108179af65
+refs/heads/master: 03ff60df34892e8c471873a088b075a5b621ce0a
diff --git a/trunk/drivers/s390/cio/idset.c b/trunk/drivers/s390/cio/idset.c
index 65d13e38803f..5a999084a229 100644
--- a/trunk/drivers/s390/cio/idset.c
+++ b/trunk/drivers/s390/cio/idset.c
@@ -17,7 +17,7 @@ struct idset {
 
 static inline unsigned long bitmap_size(int num_ssid, int num_id)
 {
-	return __BITOPS_WORDS(num_ssid * num_id) * sizeof(unsigned long);
+	return BITS_TO_LONGS(num_ssid * num_id) * sizeof(unsigned long);
 }
 
 static struct idset *idset_new(int num_ssid, int num_id)