2 files changed, 3 insertions, 4 deletions

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index dca58b9ba8c6..7285145ac1c9 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2788,7 +2788,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE823, ricoh_
 DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE823, ricoh_mmc_fixup_r5c832);
 #endif /*CONFIG_MMC_RICOH_MMC*/
 
-#if defined(CONFIG_DMAR) || defined(CONFIG_INTR_REMAP)
+#ifdef CONFIG_DMAR_TABLE
 #define VTUNCERRMSK_REG 0x1ac
 #define VTD_MSK_SPEC_ERRORS     (1 << 31)
 /*
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
index 6fa215a38615..90832a955991 100644
--- a/drivers/pci/xen-pcifront.c
+++ b/drivers/pci/xen-pcifront.c
@@ -400,9 +400,8 @@ static int pcifront_claim_resource(struct pci_dev *dev, void *data)
                         dev_info(&pdev->xdev->dev, "claiming resource %s/%d\n",
                                 pci_name(dev), i);
                         if (pci_claim_resource(dev, i)) {
-                                dev_err(&pdev->xdev->dev, "Could not claim "
-                                        "resource %s/%d! Device offline. Try "
-                                        "giving less than 4GB to domain.\n",
+                                dev_err(&pdev->xdev->dev, "Could not claim resource %s/%d! "
+                                        "Device offline. Try using e820_host=1 in the guest config.\n",
                                         pci_name(dev), i);
                         }
                 }