r949 - coreboot-v3/arch/x86

Author: myles
Date: 2008-10-23 18:47:42 +0200 (Thu, 23 Oct 2008)
New Revision: 949

Modified:
   coreboot-v3/arch/x86/archtables.c
   coreboot-v3/arch/x86/multiboot.c
Log:
This patch adds explicit casts to remove some compiler warnings.

Signed-off-by: Myles Watson 
Acked-by: Ronald G. Minnich

Modified: coreboot-v3/arch/x86/archtables.c
===================================================================
--- coreboot-v3/arch/x86/archtables.c	2008-10-23 13:09:31 UTC (rev 948)
+++ coreboot-v3/arch/x86/archtables.c	2008-10-23 16:47:42 UTC (rev 949)
@@ -145,7 +145,7 @@
 #endif

/* The Multiboot information structure */
-	mbi = rom_table_end;
+	mbi = (void*)rom_table_end;
    rom_table_end = write_multiboot_info(
    		      low_table_start, low_table_end,
    		      rom_table_start, rom_table_end);

Modified: coreboot-v3/arch/x86/multiboot.c
===================================================================
--- coreboot-v3/arch/x86/multiboot.c	2008-10-23 13:09:31 UTC (rev 948)
+++ coreboot-v3/arch/x86/multiboot.c	2008-10-23 16:47:42 UTC (rev 949)
@@ -78,12 +78,12 @@
    struct multiboot_info *mbi;
    int i;

-	mbi = rom_table_end;
+	mbi = (void*)rom_table_end;
    memset(mbi, 0, sizeof(*mbi));
    rom_table_end += sizeof(*mbi);

mbi->mmap_addr = (u32) rom_table_end;
-	mb_mem = rom_table_end;
+	mb_mem = (struct multiboot_mmap_entry*)rom_table_end;

/* reserved regions */
    reserved_mem[0].addr = low_table_start;
@@ -107,5 +107,5 @@

printk(BIOS_INFO, "Multiboot Information structure has been written.\n");

-	return mb_mem;
+	return (unsigned long)mb_mem;
 }