ia64: eliminate build warnings

Various warnings appeared since 3.4 - eliminate at least some of them.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/xen/arch/ia64/linux-xen/unwind.c b/xen/arch/ia64/linux-xen/unwind.c
index 7d41eb6fbbd53ddaf55cdd93938bd184001a90f2..469c3bbc1f6d3aadeb8338c4db91c48b6873ff1c 100644 (file)
--- a/xen/arch/ia64/linux-xen/unwind.c
+++ b/xen/arch/ia64/linux-xen/unwind.c
@@ -38,7 +38,7 @@
 // work around
 // write_trylock() does bug check, but stack unwinder can be called
 // subtle situation, so skip bug check.
-#undef write_trylock(lock)
+#undef write_trylock
 #ifdef CONFIG_SMP
 #define write_trylock(lock)    _raw_write_trylock(lock)
 #else

diff --git a/xen/arch/ia64/xen/mm.c b/xen/arch/ia64/xen/mm.c
index d2031dc10ef77e8189080077afeaa88401d6ac59..6fcdece7629e3bf262076c538856c2934762dfc9 100644 (file)
--- a/xen/arch/ia64/xen/mm.c
+++ b/xen/arch/ia64/xen/mm.c
@@ -2875,6 +2875,7 @@ donate_page(struct domain *d, struct page_info *page, unsigned int memflags)
 {
     /* needs to be implemented for transcendent memory (tmem) */
     ASSERT(0);
+    return -ENOSYS;
 }
 
 static void

diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c
index 12e67f3464ffbd95c61195f4fca9966af3bc0e63..950c9c03da1bcdc34985d7ab23ce4b96b631c487 100644 (file)
--- a/xen/common/tmem_xen.c
+++ b/xen/common/tmem_xen.c
@@ -84,6 +84,7 @@ void tmh_copy_page(char *to, char*from)
 static inline void *cli_mfn_to_va(tmem_cli_mfn_t cmfn, unsigned long *pcli_mfn)
 {
     ASSERT(0);
+    return NULL;
 }
 #define paging_mark_dirty(_x,_y) do {} while(0)
 #else

diff --git a/xen/drivers/passthrough/vtd/ia64/ats.c b/xen/drivers/passthrough/vtd/ia64/ats.c
index 0591888ebcedce130ecbeefbebe52d697359c205..6f0541fbf715be2e97e48344978d6077a4d7cdbf 100644 (file)
--- a/xen/drivers/passthrough/vtd/ia64/ats.c
+++ b/xen/drivers/passthrough/vtd/ia64/ats.c
@@ -28,6 +28,8 @@
 #include "../vtd.h"
 #include "../extern.h"
 
+struct pci_ats_dev;
+
 int ats_enabled = 0;
 
 struct acpi_drhd_unit * find_ats_dev_drhd(struct iommu *iommu)
@@ -45,12 +47,6 @@ int enable_ats_device(int seg, int bus, int devfn)
     return 0;
 }        
 
-static int device_in_domain(struct iommu *iommu,
-                            struct pci_ats_dev *pdev, u16 did)
-{
-    return 0;
-}
-
 int dev_invalidate_iotlb(struct iommu *iommu, u16 did,
     u64 addr, unsigned int size_order, u64 type)
 {

diff --git a/xen/include/asm-ia64/hvm/support.h b/xen/include/asm-ia64/hvm/support.h
index 399378e40ece9e7a8038c48b81488678218b4a48..fcbd3d2cb6c1acb1bd263f7042e04c7bd57467de 100644 (file)
--- a/xen/include/asm-ia64/hvm/support.h
+++ b/xen/include/asm-ia64/hvm/support.h
@@ -25,13 +25,14 @@
 
 #include <xen/hvm/save.h>
 
-static int hvm_girq_dest_2_vcpu_id(struct domain *d, uint8_t dest,
+static inline int hvm_girq_dest_2_vcpu_id(struct domain *d, uint8_t dest,
                                 uint8_t dest_mode)
 {
     /* TODO */
+    return -ENOSYS;
 }
 
-static void hvm_migrate_pirqs(struct vcpu *v)
+static inline void hvm_migrate_pirqs(struct vcpu *v)
 {
     /* TODO */
 }