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

right platform rather than leaking to sparc64-emu.
This commit is contained in:
Vladimir Serbinenko 2013-12-08 18:19:42 +01:00
parent 11e4167a35
commit 388f3cd0d1
2 changed files with 6 additions and 1 deletions

View file

@ -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> 2013-12-08 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/osdep/windows/emuconsole.c: Remove unsigned comparison >= 0. * grub-core/osdep/windows/emuconsole.c: Remove unsigned comparison >= 0.

View file

@ -78,7 +78,7 @@ struct grub_module_info64
#if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) \ #if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) \
|| defined (GRUB_MACHINE_MULTIBOOT) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS) \ || defined (GRUB_MACHINE_MULTIBOOT) || defined (GRUB_MACHINE_MIPS_QEMU_MIPS) \
|| defined (GRUB_MACHINE_MIPS_LOONGSON) || defined (GRUB_MACHINE_ARC) \ || 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. */ /* FIXME: stack is between 2 heap regions. Move it. */
#define GRUB_KERNEL_PRELOAD_SPACE_REUSABLE 1 #define GRUB_KERNEL_PRELOAD_SPACE_REUSABLE 1
#endif #endif