Xen devel - Jan 2010 - [GIT PULL for pciback compile fixes]

Hey Jeremy,

Please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git
pciback/fixes-compile-3

There is one patch that fixes compilation issue when Xen is not selected
in the build options.

 arch/x86/include/asm/xen/pci.h |    4 ++--
 arch/x86/xen/pci.c             |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

The domid_t type is defined as uint16_t.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
 arch/x86/include/asm/xen/pci.h |    4 ++--
 arch/x86/xen/pci.c             |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/include/asm/xen/pci.h b/arch/x86/include/asm/xen/pci.h
index d335c90..f5860c2 100644
--- a/arch/x86/include/asm/xen/pci.h
+++ b/arch/x86/include/asm/xen/pci.h
@@ -9,7 +9,7 @@ int xen_create_msi_irq(struct pci_dev *dev,
 int xen_destroy_irq(int irq);
 
 int xen_find_device_domain_owner(struct pci_dev *dev);
-int xen_register_device_domain_owner(struct pci_dev *dev, domid_t domain);
+int xen_register_device_domain_owner(struct pci_dev *dev, uint16_t domain);
 int xen_unregister_device_domain_owner(struct pci_dev *dev);
 
 #else
@@ -33,7 +33,7 @@ static inline int xen_find_device_domain_owner(struct pci_dev
*dev)
 	return -1;
 }
 static inline int xen_register_device_domain_owner(struct pci_dev *dev,
-						   domid_t domain)
+						   uint16_t domain)
 {
  	return -1;
 }
diff --git a/arch/x86/xen/pci.c b/arch/x86/xen/pci.c
index 1758c26..6b43dec 100644
--- a/arch/x86/xen/pci.c
+++ b/arch/x86/xen/pci.c
@@ -145,7 +145,7 @@ int xen_find_device_domain_owner(struct pci_dev *dev)
 }
 EXPORT_SYMBOL(xen_find_device_domain_owner);
 
-int xen_register_device_domain_owner(struct pci_dev *dev, domid_t domain)
+int xen_register_device_domain_owner(struct pci_dev *dev, uint16_t domain)
 {
 	struct xen_device_domain_owner *owner;
 
-- 
1.6.2.5


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel