* include/grub/kernel.h [__sparc__]: Restrict sparc64-ieee1275 to

	right platform rather than leaking to sparc64-emu.

diff --git a/ChangeLog b/ChangeLog
index 9e2ed0c60b78fa94f7f9c94edf702211e92c7bc4..f4691f3a499f1cd40e8cfd574df80508ca618374 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * include/grub/kernel.h [__sparc__]: Restrict sparc64-ieee1275 to
+       right platform rather than leaking to sparc64-emu.
+
 2013-12-08  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/osdep/windows/emuconsole.c: Remove unsigned comparison >= 0.

diff --git a/include/grub/kernel.h b/include/grub/kernel.h
index a5067ef79b8e91345e51957603f7b07a9f5b3717..20ddf2da297d5c883ed5b5542f2cfd99ee9c18da 100644 (file)
--- a/include/grub/kernel.h
+++ b/include/grub/kernel.h
@@ -78,7 +78,7 @@ struct grub_module_info64
 #if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) \
   || defined (GRUB_MACHINE_MULTIBOOT) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS) \
   || defined (GRUB_MACHINE_MIPS_LOONGSON) || defined (GRUB_MACHINE_ARC) \
-  || defined (__sparc__) || defined (GRUB_MACHINE_UBOOT) || defined (GRUB_MACHINE_XEN)
+  || (defined (__sparc__) && defined (GRUB_MACHINE_IEEE1275)) || defined (GRUB_MACHINE_UBOOT) || defined (GRUB_MACHINE_XEN)
 /* FIXME: stack is between 2 heap regions. Move it.  */
 #define GRUB_KERNEL_PRELOAD_SPACE_REUSABLE 1
 #endif