git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-x86_64
/
dmi.h
diff --git
a/include/asm-x86_64/dmi.h
b/include/asm-x86_64/dmi.h
index
93b2b15
..
613b969
100644
(file)
--- a/
include/asm-x86_64/dmi.h
+++ b/
include/asm-x86_64/dmi.h
@@
-5,6
+5,10
@@
extern void *dmi_ioremap(unsigned long addr, unsigned long size);
extern void dmi_iounmap(void *addr, unsigned long size);
extern void *dmi_ioremap(unsigned long addr, unsigned long size);
extern void dmi_iounmap(void *addr, unsigned long size);
+#ifdef CONFIG_XEN
+extern void *bt_ioremap(unsigned long addr, unsigned long size);
+extern void bt_iounmap(void *addr, unsigned long size);
+#endif
#define DMI_MAX_DATA 2048
#define DMI_MAX_DATA 2048
@@
-21,7
+25,12
@@
static inline void *dmi_alloc(unsigned len)
return dmi_alloc_data + idx;
}
return dmi_alloc_data + idx;
}
+#ifdef CONFIG_XEN
+#define dmi_ioremap bt_ioremap
+#define dmi_iounmap bt_iounmap
+#else
#define dmi_ioremap early_ioremap
#define dmi_iounmap early_iounmap
#define dmi_ioremap early_ioremap
#define dmi_iounmap early_iounmap
+#endif
#endif
#endif