aboutsummaryrefslogtreecommitdiffstats
path: root/xen/arch/x86/dmi_scan.c
diff options
context:
space:
mode:
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2005-05-25 22:18:10 +0000
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2005-05-25 22:18:10 +0000
commit1e3c2c1671cdf008cd7dab03c502e655b51953d8 (patch)
tree0ec1cefcea26e2594465efe103c368b4af0ee209 /xen/arch/x86/dmi_scan.c
parent4e9ae8c3666f9d4e2b56f24ff5873565a0aa9d60 (diff)
downloadxen-1e3c2c1671cdf008cd7dab03c502e655b51953d8.tar.gz
xen-1e3c2c1671cdf008cd7dab03c502e655b51953d8.tar.bz2
xen-1e3c2c1671cdf008cd7dab03c502e655b51953d8.zip
bitkeeper revision 1.1558 (4294f9a2Vif6PUYZMV6j1GuP-Mn6Xg)
gcc4 build fixes. Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'xen/arch/x86/dmi_scan.c')
-rw-r--r--xen/arch/x86/dmi_scan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c
index 06f8c15a96..1d42756dc1 100644
--- a/xen/arch/x86/dmi_scan.c
+++ b/xen/arch/x86/dmi_scan.c
@@ -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 @@ struct dmi_header
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 "";