diff --git a/ChangeLog b/ChangeLog
index 16be610ea..9e4ea21dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/script/argv.c (round_up_exp): unsigned is 32-bit on all
+	supported platforms. Put a compile time assert for this rather than
+	generate a warning with 32-bit shift.
+
 2011-01-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/disk/scsi.c (grub_scsi_read): Fix binary and check and make
diff --git a/grub-core/script/argv.c b/grub-core/script/argv.c
index 50f810fcf..856828d7b 100644
--- a/grub-core/script/argv.c
+++ b/grub-core/script/argv.c
@@ -25,6 +25,8 @@
 static unsigned
 round_up_exp (unsigned v)
 {
+  COMPILE_TIME_ASSERT (sizeof (v) == 4);
+
   v--;
   v |= v >> 1;
   v |= v >> 2;
@@ -32,9 +34,6 @@ round_up_exp (unsigned v)
   v |= v >> 8;
   v |= v >> 16;
 
-  if (sizeof (v) > 4)
-    v |= v >> 32;
-
   v++;
   v += (v == 0);