diff -r b3236ee3eeb7 arch/ia64/mm/ioremap.c
--- a/arch/ia64/mm/ioremap.c	Sun Jul 23 00:46:48 2006 +0200
+++ b/arch/ia64/mm/ioremap.c	Tue Aug 08 10:33:52 2006 +0900
@@ -13,7 +13,21 @@
 #include <asm/io.h>
 #include <asm/meminit.h>
 
-static inline void __iomem *
+#ifdef CONFIG_XEN
+void __iomem *
+ioremap (unsigned long offset, unsigned long size)
+{
+	offset = HYPERVISOR_ioremap(offset, size);
+	return (void __iomem *) (__IA64_UNCACHED_OFFSET | (offset));
+}
+
+void __iomem *
+ioremap_nocache (unsigned long offset, unsigned long size)
+{
+	return (void __iomem *)ioremap(offset, size);
+}
+#else
+void __iomem *
 __ioremap (unsigned long offset, unsigned long size)
 {
 	offset = HYPERVISOR_ioremap(offset, size);
@@ -59,3 +73,4 @@ ioremap_nocache (unsigned long offset, u
 	return __ioremap(offset, size);
 }
 EXPORT_SYMBOL(ioremap_nocache);
+#endif /* XEN */
diff -r b3236ee3eeb7 drivers/char/tpm/tpm.h
--- a/drivers/char/tpm/tpm.h	Sun Jul 23 00:46:48 2006 +0200
+++ b/drivers/char/tpm/tpm.h	Tue Aug 08 10:33:52 2006 +0900
@@ -125,7 +125,7 @@ static inline void tpm_write_index(int b
 
 static inline u32 get_chip_buffersize(struct tpm_chip *chip)
 {
-	return chip->vendor->buffersize;
+	return chip->vendor.buffersize;
 }
 
 extern void tpm_get_timeouts(struct tpm_chip *);
diff -r b3236ee3eeb7 drivers/xen/core/evtchn.c
--- a/drivers/xen/core/evtchn.c	Sun Jul 23 00:46:48 2006 +0200
+++ b/drivers/xen/core/evtchn.c	Tue Aug 08 10:33:52 2006 +0900
@@ -694,7 +694,7 @@ int irq_ignore_unhandled(unsigned int ir
 	return !!(irq_status.flags & XENIRQSTAT_shared);
 }
 
-void resend_irq_on_evtchn(struct hw_interrupt_type *h, unsigned int i)
+void resend_irq_on_evtchn(unsigned int i)
 {
 	int evtchn = evtchn_from_irq(i);
 	shared_info_t *s = HYPERVISOR_shared_info;
diff -r b3236ee3eeb7 include/asm-ia64/hw_irq.h
--- a/include/asm-ia64/hw_irq.h	Sun Jul 23 00:46:48 2006 +0200
+++ b/include/asm-ia64/hw_irq.h	Tue Aug 08 10:33:52 2006 +0900
@@ -104,10 +104,9 @@ static inline void ia64_resend_irq(unsig
 static inline void ia64_resend_irq(unsigned int vector)
 {
 #ifdef CONFIG_XEN
-	extern void resend_irq_on_evtchn(struct hw_interrupt_type *h,
-					 unsigned int i);
+	extern void resend_irq_on_evtchn(unsigned int i);
 	if (is_running_on_xen())
-		resend_irq_on_evtchn(h, vector);
+		resend_irq_on_evtchn(vector);
 	else
 #endif /* CONFIG_XEN */
 	platform_send_ipi(smp_processor_id(), vector, IA64_IPI_DM_INT, 0);
diff -r b3236ee3eeb7 include/asm-ia64/io.h
--- a/include/asm-ia64/io.h	Sun Jul 23 00:46:48 2006 +0200
+++ b/include/asm-ia64/io.h	Tue Aug 08 10:33:52 2006 +0900
@@ -457,19 +457,14 @@ __writeq (unsigned long val, volatile vo
  *
  * On ia-64, we access the physical I/O memory space through the uncached kernel region.
  */
-static inline void __iomem *
-ioremap (unsigned long offset, unsigned long size)
-{
-	offset = HYPERVISOR_ioremap(offset, size);
-	return (void __iomem *) (__IA64_UNCACHED_OFFSET | (offset));
-}
+extern void __iomem * ioremap(unsigned long offset, unsigned long size);
+extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size);
 
 static inline void
 iounmap (volatile void __iomem *addr)
 {
 }
 
-#define ioremap_nocache(o,s)	ioremap(o,s)
 
 /* Use normal IO mappings for DMI */
 #define dmi_ioremap ioremap