diff --git a/ChangeLog b/ChangeLog
index 7e12dc2eb..0f030b942 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-16  Yoshinori K. Okuji  <okuji@enbug.org>
+
+	* grub/asmstub.c (grub_stage2): Remove the attribute `volatile'
+	from doit. I hope this change is safe for all compilers.
+
 2005-02-15  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	* stage2/builtins.c (install_func): If DEST_DRIVE is a hard
diff --git a/grub/asmstub.c b/grub/asmstub.c
index 1a4b82f29..ab95b4b6f 100644
--- a/grub/asmstub.c
+++ b/grub/asmstub.c
@@ -117,7 +117,7 @@ grub_stage2 (void)
   
   /* We need a nested function so that we get a clean stack frame,
      regardless of how the code is optimized. */
-  volatile void doit (void)
+  void doit (void)
     {
       /* Make sure our stack lives in the simulated memory area. */
       asm volatile ("movl %%esp, %0\n\tmovl %1, %%esp\n"