# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1259578703 0
# Node ID abc6183f486e66b5721dbf0313ee0d3460613a99
# Parent b5bb8746201bcefa089ebb02a1c8674f76aed0b4
ia64: eliminate build warnings
Various warnings appeared since 3.4 - eliminate at least some of them.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
xen/arch/ia64/linux-xen/unwind.c | 2 +-
xen/arch/ia64/xen/mm.c | 1 +
xen/common/tmem_xen.c | 1 +
xen/drivers/passthrough/vtd/ia64/ats.c | 8 ++------
xen/include/asm-ia64/hvm/support.h | 5 +++--
5 files changed, 8 insertions(+), 9 deletions(-)
diff -r b5bb8746201b -r abc6183f486e xen/arch/ia64/linux-xen/unwind.c
--- a/xen/arch/ia64/linux-xen/unwind.c Mon Nov 30 10:57:42 2009 +0000
+++ b/xen/arch/ia64/linux-xen/unwind.c Mon Nov 30 10:58:23 2009 +0000
@@ -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 -r b5bb8746201b -r abc6183f486e xen/arch/ia64/xen/mm.c
--- a/xen/arch/ia64/xen/mm.c Mon Nov 30 10:57:42 2009 +0000
+++ b/xen/arch/ia64/xen/mm.c Mon Nov 30 10:58:23 2009 +0000
@@ -2875,6 +2875,7 @@ donate_page(struct domain *d, struct pag
{
/* needs to be implemented for transcendent memory (tmem) */
ASSERT(0);
+ return -ENOSYS;
}
static void
diff -r b5bb8746201b -r abc6183f486e xen/common/tmem_xen.c
--- a/xen/common/tmem_xen.c Mon Nov 30 10:57:42 2009 +0000
+++ b/xen/common/tmem_xen.c Mon Nov 30 10:58:23 2009 +0000
@@ -84,6 +84,7 @@ static inline void *cli_mfn_to_va(tmem_c
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 -r b5bb8746201b -r abc6183f486e xen/drivers/passthrough/vtd/ia64/ats.c
--- a/xen/drivers/passthrough/vtd/ia64/ats.c Mon Nov 30 10:57:42 2009 +0000
+++ b/xen/drivers/passthrough/vtd/ia64/ats.c Mon Nov 30 10:58:23 2009 +0000
@@ -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,
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 -r b5bb8746201b -r abc6183f486e xen/include/asm-ia64/hvm/support.h
--- a/xen/include/asm-ia64/hvm/support.h Mon Nov 30 10:57:42 2009 +0000
+++ b/xen/include/asm-ia64/hvm/support.h Mon Nov 30 10:58:23 2009 +0000
@@ -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 */
}
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home