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.

diff --git a/ChangeLog b/ChangeLog
index 22c14424e269274d5882e448ce1324a1727a26ba..c91b4a042adb90340ebd726f3626ec4c22b20f97 100644 (file)
--- 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 745af43c34c4ea47556aec7a536e347a73d95ceb..27e44f0a2d7b1fb6f4c66b4ecbac294d3be5843d 100644 (file)
--- 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 550a2a60ad3e32bac097d35e4aff8848187ca636..5f80f28c1c4cc3312cd1aa3b1728e0ee0d89d9c6 100644 (file)
--- 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 e1950d75857b67b5e655ed9859c84ef18268a402..f73f828c6ef5da6502980cbf4ceaead31ef39a32 100644 (file)
--- 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 7658ee1a7bb866ebedf6955cfb1a387d0c19a936..9fb98739bbe4945ca24d3060c3646eae7390150d 100644 (file)
--- 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 1707049fe5f616a6576388530b6c97e3da5eccd8..fa646df1975195be594e28cc0a9c65f26ce9fb3f 100644 (file)
--- 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 371e7cc149b6a3e9c0d9ca1501db60dd3a2f1927..4e8eec323cb8c5f0f6fc241d20ce0a986092f37f 100644 (file)
--- 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