merge with linux-2.6.18-xen.hg

diff --cc include/xen/interface/io/pciif.h
index 62147ad27d2b71fe72c20c1187c58ec97c995017,62147ad27d2b71fe72c20c1187c58ec97c995017..42dcfdb1ab733e943120f483566e1ca0649c8821
--- 1/include/xen/interface/io/pciif.h
--- 2/include/xen/interface/io/pciif.h
+++ b/include/xen/interface/io/pciif.h
@@@ -34,10 -34,10 +34,6 @@@
  /* xen_pci_op commands */
  #define XEN_PCI_OP_conf_read    (0)
  #define XEN_PCI_OP_conf_write   (1)
--#define XEN_PCI_OP_enable_msi   (2)
--#define XEN_PCI_OP_disable_msi  (3)
--#define XEN_PCI_OP_enable_msix  (4)
--#define XEN_PCI_OP_disable_msix (5)
  
  /* xen_pci_op error numbers */
  #define XEN_PCI_ERR_success          (0)
@@@ -48,12 -48,12 +44,6 @@@
  /* XEN_PCI_ERR_op_failed - backend failed to complete the operation */
  #define XEN_PCI_ERR_op_failed       (-5)
  
--/*
-- * it should be PAGE_SIZE-sizeof(struct xen_pci_op))/sizeof(struct msix_entry))
-- * Should not exceed 128
-- */
--#define SH_INFO_MAX_VEC     128
--
  struct xen_pci_op {
      /* IN: what action to perform: XEN_PCI_OP_* */
      uint32_t cmd;
@@@ -72,10 -72,10 +62,6 @@@
  
      /* IN/OUT: Contains the result after a READ or the value to WRITE */
      uint32_t value;
--    /* IN: Contains extra infor for this operation */
--    uint32_t info;
--    /*IN:  param for msi-x */
--    struct msix_entry msix_entries[SH_INFO_MAX_VEC];
  };
  
  struct xen_pci_sharedinfo {