From a4ea2dff4b2efe0c4407b091a884f407bd3569bc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 9 Feb 2012 23:48:34 +0100
Subject: [PATCH] 	* grub-core/commands/lsacpi.c (disp_acpi_xsdt_table):
 #if'-out the 	checks which are always false on some platforms. 
 (grub_cmd_lsacpi): Likewise. 	* grub-core/kern/misc.c (grub_strtoul):
 Likewise. 	* grub-core/loader/multiboot.c
 (grub_multiboot_set_video_mode): 	Likewise.

---
 ChangeLog                    |  9 +++++++++
 grub-core/commands/lsacpi.c  | 10 +++++++---
 grub-core/kern/misc.c        |  2 ++
 grub-core/loader/multiboot.c |  6 +++++-
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f02f35fd1..20bb5963b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-02-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/commands/lsacpi.c (disp_acpi_xsdt_table): #if'-out the
+	checks which are always false on some platforms.
+	(grub_cmd_lsacpi): Likewise.
+	* grub-core/kern/misc.c (grub_strtoul): Likewise.
+	* grub-core/loader/multiboot.c (grub_multiboot_set_video_mode):
+	Likewise.
+
 2012-02-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/disk/diskfilter.c (read_segment): Renome unreachable code.
diff --git a/grub-core/commands/lsacpi.c b/grub-core/commands/lsacpi.c
index fe6f70341..f219022a0 100644
--- a/grub-core/commands/lsacpi.c
+++ b/grub-core/commands/lsacpi.c
@@ -132,11 +132,13 @@ disp_acpi_xsdt_table (struct grub_acpi_table_header *t)
   desc = (grub_uint64_t *) (t + 1);
   for (; len > 0; desc++, len -= sizeof (*desc))
     {
-      if (sizeof (grub_addr_t) == 4 && *desc >= (1ULL << 32))
+#if GRUB_CPU_SIZEOF_VOID_P == 4
+      if (*desc >= (1ULL << 32))
 	{
 	  grub_printf ("Unreachable table\n");
 	  continue;
 	}
+#endif
       t = (struct grub_acpi_table_header *) (grub_addr_t) *desc;
 
       if (t == NULL)
@@ -222,9 +224,11 @@ grub_cmd_lsacpi (struct grub_extcmd_context *ctxt,
 	grub_printf ("No RSDPv2\n");
       else
 	{
-	  if (sizeof (grub_addr_t) == 4 && rsdp2->xsdt_addr >= (1ULL << 32))
-	      grub_printf ("Unreachable RSDPv2\n");
+#if GRUB_CPU_SIZEOF_VOID_P == 4
+	  if (rsdp2->xsdt_addr >= (1ULL << 32))
+	    grub_printf ("Unreachable RSDPv2\n");
 	  else
+#endif
 	    {
 	      grub_printf ("RSDPv2 signature:");
 	      disp_acpi_rsdpv2 (rsdp2);
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
index 0d2ae4bd6..ebeab0ec4 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -370,11 +370,13 @@ grub_strtoul (const char *str, char **end, int base)
   unsigned long long num;
 
   num = grub_strtoull (str, end, base);
+#if GRUB_CPU_SIZEOF_LONG != 8
   if (num > ~0UL)
     {
       grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow is detected");
       return ~0UL;
     }
+#endif
 
   return (unsigned long) num;
 }
diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
index 9c1fd9146..d8951ce9e 100644
--- a/grub-core/loader/multiboot.c
+++ b/grub-core/loader/multiboot.c
@@ -90,7 +90,9 @@ grub_multiboot_set_video_mode (void)
   grub_err_t err;
   const char *modevar;
 
-  if (accepts_video || !GRUB_MACHINE_HAS_VGA_TEXT)
+#if GRUB_MACHINE_HAS_VGA_TEXT
+  if (accepts_video)
+#endif
     {
       modevar = grub_env_get ("gfxpayload");
       if (! modevar || *modevar == 0)
@@ -105,8 +107,10 @@ grub_multiboot_set_video_mode (void)
 	  grub_free (tmp);
 	}
     }
+#if GRUB_MACHINE_HAS_VGA_TEXT
   else
     err = grub_video_set_mode ("text", 0, 0);
+#endif
 
   return err;
 }