diff --git a/[refs] b/[refs]
index 3bf0321f8b33..953187c56d5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bf8d889ed453f709dedacabdcf5db47470fdae9
+refs/heads/master: f0c00257d63463fa9d692e632fae037d6c0e67b0
diff --git a/trunk/lib/int_sqrt.c b/trunk/lib/int_sqrt.c
index a5d2cdc5684c..fd355a99327c 100644
--- a/trunk/lib/int_sqrt.c
+++ b/trunk/lib/int_sqrt.c
@@ -15,7 +15,7 @@ unsigned long int_sqrt(unsigned long x)
 	op = x;
 	res = 0;
 
-	one = 1 << 30;
+	one = 1UL << (BITS_PER_LONG - 2);
 	while (one > op)
 		one >>= 2;