diff --git a/ChangeLog b/ChangeLog
index 5fb9b77ab..3b4b3b42b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-07  Andrey Borzenkov <arvidjaar@gmail.com>
+
+	* grub-core/fs/iso9660.c (add_part): Remove always_inline attribute
+	causing gcc error with gcc 4.7.1.
+
 2013-03-07  Nickolai Zeldovich <nickolai@csail.mit.edu>
 
 	* grub-core/commands/acpi.c (grub_acpi_create_ebda): Don't
diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
index 01a07b8c4..cdbd6dc36 100644
--- a/grub-core/fs/iso9660.c
+++ b/grub-core/fs/iso9660.c
@@ -524,7 +524,7 @@ struct iterate_dir_ctx
 };
 
   /* Extend the symlink.  */
-static void  __attribute__ ((always_inline))
+static void
 add_part (struct iterate_dir_ctx *ctx,
 	  const char *part,
 	  int len2)