From 8f891adc6f193b70915635418c2b73b5450b1546 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 00:52:31 +0100
Subject: [PATCH] 2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>

	* include/grub/cache.h (grub_arch_sync_caches) [i386 || x86_64]: Inline.
	* kern/i386/coreboot/init.c (grub_arch_sync_caches): Remove.
	* kern/i386/efi/init.c (grub_arch_sync_caches): Likewise.
	* kern/i386/ieee1275/init.c (grub_arch_sync_caches): Likewise.
	* kern/i386/pc/init.c (grub_arch_sync_caches): Likewise.
	* util/misc.c (grub_arch_sync_caches) [i386 || x86_64]: Likewise.
---
 ChangeLog                 | 9 +++++++++
 include/grub/cache.h      | 8 ++++++++
 kern/i386/coreboot/init.c | 6 ------
 kern/i386/efi/init.c      | 6 ------
 kern/i386/ieee1275/init.c | 6 ------
 kern/i386/pc/init.c       | 6 ------
 util/misc.c               | 2 ++
 7 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 22c14424e..c91b4a042 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/cache.h (grub_arch_sync_caches) [i386 || x86_64]: Inline.
+	* kern/i386/coreboot/init.c (grub_arch_sync_caches): Remove.
+	* kern/i386/efi/init.c (grub_arch_sync_caches): Likewise.
+	* kern/i386/ieee1275/init.c (grub_arch_sync_caches): Likewise.
+	* kern/i386/pc/init.c (grub_arch_sync_caches): Likewise.
+	* util/misc.c (grub_arch_sync_caches) [i386 || x86_64]: Likewise.
+
 2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/err.h (grub_err_printf): Don't export.
diff --git a/include/grub/cache.h b/include/grub/cache.h
index 745af43c3..27e44f0a2 100644
--- a/include/grub/cache.h
+++ b/include/grub/cache.h
@@ -23,6 +23,14 @@
 #include <grub/symbol.h>
 #include <grub/types.h>
 
+#if defined (__i386__) || defined (__x86_64__)
+static inline void
+grub_arch_sync_caches (void *address __attribute__ ((unused)),
+		       grub_size_t len __attribute__ ((unused)))
+{
+}
+#else
 void EXPORT_FUNC(grub_arch_sync_caches) (void *address, grub_size_t len);
+#endif
 
 #endif /* ! GRUB_CACHE_HEADER */
diff --git a/kern/i386/coreboot/init.c b/kern/i386/coreboot/init.c
index 550a2a60a..5f80f28c1 100644
--- a/kern/i386/coreboot/init.c
+++ b/kern/i386/coreboot/init.c
@@ -67,12 +67,6 @@ grub_exit (void)
     grub_cpu_idle ();
 }
 
-void
-grub_arch_sync_caches (void *address __attribute__ ((unused)),
-		       grub_size_t len __attribute__ ((unused)))
-{
-}
-
 void
 grub_machine_init (void)
 {
diff --git a/kern/i386/efi/init.c b/kern/i386/efi/init.c
index e1950d758..f73f828c6 100644
--- a/kern/i386/efi/init.c
+++ b/kern/i386/efi/init.c
@@ -45,9 +45,3 @@ grub_machine_set_prefix (void)
 {
   grub_efi_set_prefix ();
 }
-
-void
-grub_arch_sync_caches (void *address __attribute__ ((unused)),
-                       grub_size_t len __attribute__ ((unused)))
-{
-}
diff --git a/kern/i386/ieee1275/init.c b/kern/i386/ieee1275/init.c
index 7658ee1a7..9fb98739b 100644
--- a/kern/i386/ieee1275/init.c
+++ b/kern/i386/ieee1275/init.c
@@ -26,9 +26,3 @@ void
 grub_stop_floppy (void)
 {
 }
-
-void
-grub_arch_sync_caches (void *address __attribute__ ((unused)),
-		       grub_size_t len __attribute__ ((unused)))
-{
-}
diff --git a/kern/i386/pc/init.c b/kern/i386/pc/init.c
index 1707049fe..fa646df19 100644
--- a/kern/i386/pc/init.c
+++ b/kern/i386/pc/init.c
@@ -47,12 +47,6 @@ static int num_regions;
 grub_addr_t grub_os_area_addr;
 grub_size_t grub_os_area_size;
 
-void
-grub_arch_sync_caches (void *address __attribute__ ((unused)),
-		       grub_size_t len __attribute__ ((unused)))
-{
-}
-
 static char *
 make_install_device (void)
 {
diff --git a/util/misc.c b/util/misc.c
index 371e7cc14..4e8eec323 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -371,11 +371,13 @@ grub_millisleep (grub_uint32_t ms)
 
 #endif
 
+#if !(defined (__i386__) || defined (__x86_64__))
 void
 grub_arch_sync_caches (void *address __attribute__ ((unused)),
 		       grub_size_t len __attribute__ ((unused)))
 {
 }
+#endif
 
 #ifndef HAVE_VASPRINTF