ChangeSet 1.1558, 2005/05/25 23:18:10+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx
gcc4 build fixes.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
dmi_scan.c | 4 ++--
genapic/es7000plat.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff -Nru a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c
--- a/xen/arch/x86/dmi_scan.c 2005-05-25 19:01:32 -04:00
+++ b/xen/arch/x86/dmi_scan.c 2005-05-25 19:01:32 -04:00
@@ -9,7 +9,7 @@
#include <asm/system.h>
#include <xen/dmi.h>
-#define bt_ioremap(b,l) __acpi_map_table(b,l)
+#define bt_ioremap(b,l) ((u8 *)__acpi_map_table(b,l))
#define bt_iounmap(b,l) ((void)0)
#define ioremap(b,l) (__va(b))
#define memcpy_fromio memcpy
@@ -34,7 +34,7 @@
static char * __init dmi_string(struct dmi_header *dm, u8 s)
{
- u8 *bp=(u8 *)dm;
+ char *bp=(char *)dm;
bp+=dm->length;
if(!s)
return "";
diff -Nru a/xen/arch/x86/genapic/es7000plat.c
b/xen/arch/x86/genapic/es7000plat.c
--- a/xen/arch/x86/genapic/es7000plat.c 2005-05-25 19:01:32 -04:00
+++ b/xen/arch/x86/genapic/es7000plat.c 2005-05-25 19:01:32 -04:00
@@ -149,7 +149,7 @@
unsigned long rsdp_phys = 0;
struct acpi_table_header *header = NULL;
int i;
- struct acpi_table_sdt sdt;
+ struct acpi_table_sdt sdt = { 0 };
rsdp_phys = acpi_find_rsdp();
rsdp = __va(rsdp_phys);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|