From 6ed035ea2c8c8c22bfb5d59b76fd1cc893852e9f Mon Sep 17 00:00:00 2001
From: Weidong Han <weidong.han@intel.com>
Date: Mon, 8 Dec 2008 09:17:15 +0800
Subject: [PATCH] --- yaml --- r: 125569 b: refs/heads/master c:
 3b5410e735b093060b96664230c6f9f4fe80b251 h: refs/heads/master i:   125567:
 01a407c11eefd5f691d84cdce6780a96a959736e v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/pci/intel-iommu.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0e0ef6fe014f..cef9f4d2f776 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d71a2f33ac466a437f316e7bb024d0175a7f3cd9
+refs/heads/master: 3b5410e735b093060b96664230c6f9f4fe80b251
diff --git a/trunk/drivers/pci/intel-iommu.c b/trunk/drivers/pci/intel-iommu.c
index 65aa1d427f43..22ad8851b3e0 100644
--- a/trunk/drivers/pci/intel-iommu.c
+++ b/trunk/drivers/pci/intel-iommu.c
@@ -200,6 +200,9 @@ static inline bool dma_pte_present(struct dma_pte *pte)
 	return (pte->val & 3) != 0;
 }
 
+/* devices under the same p2p bridge are owned in one domain */
+#define DOMAIN_FLAG_P2P_MULTIPLE_DEVICES (1 < 0)
+
 struct dmar_domain {
 	int	id;			/* domain id */
 	struct intel_iommu *iommu;	/* back pointer to owning iommu */
@@ -214,8 +217,7 @@ struct dmar_domain {
 	/* adjusted guest address width, 0 is level 2 30-bit */
 	int		agaw;
 
-#define DOMAIN_FLAG_MULTIPLE_DEVICES 1
-	int		flags;
+	int		flags;		/* flags to find out type of domain */
 };
 
 /* PCI domain-device relationship */
@@ -1574,7 +1576,7 @@ static struct dmar_domain *get_domain_for_dev(struct pci_dev *pdev, int gaw)
 		info->dev = NULL;
 		info->domain = domain;
 		/* This domain is shared by devices under p2p bridge */
-		domain->flags |= DOMAIN_FLAG_MULTIPLE_DEVICES;
+		domain->flags |= DOMAIN_FLAG_P2P_MULTIPLE_DEVICES;
 
 		/* pcie-to-pci bridge already has a domain, uses it */
 		found = NULL;