diff --git a/ChangeLog b/ChangeLog
index c839e398e..1608dd9c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/emu/hostdisk.c (read_device_map): Add missing noreturn
+	on show_error.
+
 2012-02-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/disk.c (grub_disk_write): Add missing const qualifier.
diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
index 46e751e33..bd8c2816e 100644
--- a/grub-core/kern/emu/hostdisk.c
+++ b/grub-core/kern/emu/hostdisk.c
@@ -1145,8 +1145,9 @@ read_device_map (const char *dev_map)
   int lineno = 0;
   struct stat st;
 
-  auto void show_error (const char *msg);
-  void show_error (const char *msg)
+  auto void show_error (const char *msg)
+    __attribute__ ((noreturn));
+  void __attribute__ ((noreturn)) show_error (const char *msg)
     {
       grub_util_error ("%s:%d: %s", dev_map, lineno, msg);
     }