From e2a6810069f81af648eb7f2b5307ef9341e351c7 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Fri, 8 Nov 2013 09:27:56 +0100
Subject: [PATCH] 	* grub-core/lib/reed_solomon.c
 (grub_reed_solomon_recover): Add 	missing attribute. 	*
 grub-core/gdb/cstub.c (grub_gdb_trap): Likewise.

---
 ChangeLog                    |  6 ++++++
 grub-core/gdb/cstub.c        |  2 +-
 grub-core/lib/reed_solomon.c | 14 +++++++++-----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b55f5faa7..35847a14c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/lib/reed_solomon.c (grub_reed_solomon_recover): Add
+	missing attribute.
+	* grub-core/gdb/cstub.c (grub_gdb_trap): Likewise.
+
 2013-11-08  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/misc.c (grub_divmod64): Don't fallback to
diff --git a/grub-core/gdb/cstub.c b/grub-core/gdb/cstub.c
index 470fa917a..c94411b10 100644
--- a/grub-core/gdb/cstub.c
+++ b/grub-core/gdb/cstub.c
@@ -201,7 +201,7 @@ grub_gdb_hex2int (char **ptr, grub_uint64_t *int_value)
 }
 
 /* This function does all command procesing for interfacing to gdb.  */
-void
+void __attribute__ ((regparm(3)))
 grub_gdb_trap (int trap_no)
 {
   unsigned int sig_no;
diff --git a/grub-core/lib/reed_solomon.c b/grub-core/lib/reed_solomon.c
index 04a271619..ab1b4e59e 100644
--- a/grub-core/lib/reed_solomon.c
+++ b/grub-core/lib/reed_solomon.c
@@ -52,12 +52,16 @@ typedef unsigned char grub_uint8_t;
 #include <grub/types.h>
 #include <grub/misc.h>
 #endif
+#ifdef __i386__
+#define REED_SOLOMON_ATTRIBUTE  __attribute__ ((regparm(3)))
+#else
+#define REED_SOLOMON_ATTRIBUTE
+#endif
 void
 grub_reed_solomon_recover (void *ptr_, grub_size_t s, grub_size_t rs)
-#ifdef __i386__
-  __attribute__ ((regparm(3)))
-#endif
-  ;
+  REED_SOLOMON_ATTRIBUTE;
+#else
+#define REED_SOLOMON_ATTRIBUTE
 #endif
 
 #define GF_SIZE 8
@@ -381,7 +385,7 @@ grub_reed_solomon_add_redundancy (void *buffer, grub_size_t data_size,
 }
 #endif
 
-void
+void REED_SOLOMON_ATTRIBUTE
 grub_reed_solomon_recover (void *ptr_, grub_size_t s, grub_size_t rs)
 {
   gf_single_t *ptr = ptr_;