ia64/xen-unstable

changeset 5161:e82fb753b02f

bitkeeper revision 1.1558 (4294f9a2Vif6PUYZMV6j1GuP-Mn6Xg)

gcc4 build fixes.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed May 25 22:18:10 2005 +0000 (2005-05-25)
parents c62ee1a8ba98
children c7447090c261
files xen/arch/x86/dmi_scan.c xen/arch/x86/genapic/es7000plat.c
line diff
     1.1 --- a/xen/arch/x86/dmi_scan.c	Wed May 25 17:43:39 2005 +0000
     1.2 +++ b/xen/arch/x86/dmi_scan.c	Wed May 25 22:18:10 2005 +0000
     1.3 @@ -9,7 +9,7 @@
     1.4  #include <asm/system.h>
     1.5  #include <xen/dmi.h>
     1.6  
     1.7 -#define bt_ioremap(b,l)  __acpi_map_table(b,l)
     1.8 +#define bt_ioremap(b,l)  ((u8 *)__acpi_map_table(b,l))
     1.9  #define bt_iounmap(b,l)  ((void)0)
    1.10  #define ioremap(b,l)     (__va(b))
    1.11  #define memcpy_fromio    memcpy
    1.12 @@ -34,7 +34,7 @@ struct dmi_header
    1.13  
    1.14  static char * __init dmi_string(struct dmi_header *dm, u8 s)
    1.15  {
    1.16 -	u8 *bp=(u8 *)dm;
    1.17 +	char *bp=(char *)dm;
    1.18  	bp+=dm->length;
    1.19  	if(!s)
    1.20  		return "";
     2.1 --- a/xen/arch/x86/genapic/es7000plat.c	Wed May 25 17:43:39 2005 +0000
     2.2 +++ b/xen/arch/x86/genapic/es7000plat.c	Wed May 25 22:18:10 2005 +0000
     2.3 @@ -149,7 +149,7 @@ find_unisys_acpi_oem_table(unsigned long
     2.4  	unsigned long			rsdp_phys = 0;
     2.5  	struct acpi_table_header 	*header = NULL;
     2.6  	int				i;
     2.7 -	struct acpi_table_sdt		sdt;
     2.8 +	struct acpi_table_sdt		sdt = { 0 };
     2.9  
    2.10  	rsdp_phys = acpi_find_rsdp();
    2.11  	rsdp = __va(rsdp_phys);