diff --git a/[refs] b/[refs]
index 9277b7f04113..ad09f63c0038 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1cafc30f43696e8b1b6f7ef4fed354cb3e3af2e6
+refs/heads/master: 14ed9d23aa9acd79210a92ac561a728b42a8e281
diff --git a/trunk/include/linux/bitmap.h b/trunk/include/linux/bitmap.h
index 64b4641904fe..acad1105d942 100644
--- a/trunk/include/linux/bitmap.h
+++ b/trunk/include/linux/bitmap.h
@@ -6,6 +6,7 @@
 #include <linux/types.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
+#include <linux/kernel.h>
 
 /*
  * bitmaps provide bit arrays that consume one or more unsigned
diff --git a/trunk/include/linux/bitops.h b/trunk/include/linux/bitops.h
index 7fc90d7cd0c9..69c1edb9fe54 100644
--- a/trunk/include/linux/bitops.h
+++ b/trunk/include/linux/bitops.h
@@ -6,8 +6,7 @@
 #define BIT(nr)			(1UL << (nr))
 #define BIT_MASK(nr)		(1UL << ((nr) % BITS_PER_LONG))
 #define BIT_WORD(nr)		((nr) / BITS_PER_LONG)
-#define BITS_TO_TYPE(nr, t)	(((nr)+(t)-1)/(t))
-#define BITS_TO_LONGS(nr)	BITS_TO_TYPE(nr, BITS_PER_LONG)
+#define BITS_TO_LONGS(nr)	DIV_ROUND_UP(nr, BITS_PER_LONG)
 #define BITS_PER_BYTE		8
 #endif