From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758588AbaGXCbC (ORCPT ); Wed, 23 Jul 2014 22:31:02 -0400 Received: from mga11.intel.com ([192.55.52.93]:61771 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757414AbaGXCbA (ORCPT ); Wed, 23 Jul 2014 22:31:00 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,721,1400050800"; d="scan'208";a="574547455" From: Jiang Liu To: Joerg Roedel , David Woodhouse , Yinghai Lu , Bjorn Helgaas , Dan Williams , Vinod Koul , "Rafael J . Wysocki" Cc: Jiang Liu , Ashok Raj , Yijing Wang , Tony Luck , iommu@lists.linux-foundation.org, linux-pci@vger.kernel.org, linux-hotplug@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org Subject: iommu/vt-d: Fix build error caused by unknown definition of acpi_handle Date: Thu, 24 Jul 2014 10:33:27 +0800 Message-Id: <1406169208-11097-1-git-send-email-jiang.liu@linux.intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <20140723153420.GC14017@8bytes.org> References: <20140723153420.GC14017@8bytes.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When both CONFIG_ACPI and CONFIG_DMAR_TABLE are disabled, commit "Implement DMAR unit hotplug framework" causes build failure as below: CC arch/x86/kernel/pci-dma.o In file included from arch/x86/kernel/pci-dma.c:3:0: include/linux/dmar.h:168:35: error: unknown type name ‘acpi_handle’ static inline int dmar_device_add(acpi_handle handle) ^ include/linux/dmar.h:173:38: error: unknown type name ‘acpi_handle’ static inline int dmar_device_remove(acpi_handle handle) ^ make[2]: *** [arch/x86/kernel/pci-dma.o] Error 1 make[1]: *** [arch/x86/kernel] Error 2 make: *** [arch/x86] Error 2 Signed-off-by: Jiang Liu --- Hi Joerg, Could you please help to merge or fold this patch to fix the build error? Regards! Gerry --- include/linux/dmar.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/dmar.h b/include/linux/dmar.h index 9c06bb4b5b14..594d4ac79e75 100644 --- a/include/linux/dmar.h +++ b/include/linux/dmar.h @@ -165,12 +165,12 @@ static inline int dmar_ir_hotplug(struct dmar_drhd_unit *dmaru, bool insert) #else /* CONFIG_DMAR_TABLE */ -static inline int dmar_device_add(acpi_handle handle) +static inline int dmar_device_add(void *handle) { return 0; } -static inline int dmar_device_remove(acpi_handle handle) +static inline int dmar_device_remove(void *handle) { return 0; } -- 1.7.10.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiang Liu Subject: iommu/vt-d: Fix build error caused by unknown definition of acpi_handle Date: Thu, 24 Jul 2014 10:33:27 +0800 Message-ID: <1406169208-11097-1-git-send-email-jiang.liu@linux.intel.com> References: <20140723153420.GC14017@8bytes.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20140723153420.GC14017-zLv9SwRftAIdnm+yROfE0A@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Joerg Roedel , David Woodhouse , Yinghai Lu , Bjorn Helgaas , Dan Williams , Vinod Koul , "Rafael J . Wysocki" Cc: Tony Luck , linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-hotplug-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dmaengine-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, Jiang Liu List-Id: iommu@lists.linux-foundation.org V2hlbiBib3RoIENPTkZJR19BQ1BJIGFuZCBDT05GSUdfRE1BUl9UQUJMRSBhcmUgZGlzYWJsZWQs IGNvbW1pdAoiSW1wbGVtZW50IERNQVIgdW5pdCBob3RwbHVnIGZyYW1ld29yayIgY2F1c2VzIGJ1 aWxkIGZhaWx1cmUgYXMgYmVsb3c6CiAgQ0MgICAgICBhcmNoL3g4Ni9rZXJuZWwvcGNpLWRtYS5v CkluIGZpbGUgaW5jbHVkZWQgZnJvbSBhcmNoL3g4Ni9rZXJuZWwvcGNpLWRtYS5jOjM6MDoKaW5j bHVkZS9saW51eC9kbWFyLmg6MTY4OjM1OiBlcnJvcjogdW5rbm93biB0eXBlIG5hbWUg4oCYYWNw aV9oYW5kbGXigJkKIHN0YXRpYyBpbmxpbmUgaW50IGRtYXJfZGV2aWNlX2FkZChhY3BpX2hhbmRs ZSBoYW5kbGUpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXgppbmNsdWRlL2xp bnV4L2RtYXIuaDoxNzM6Mzg6IGVycm9yOiB1bmtub3duIHR5cGUgbmFtZSDigJhhY3BpX2hhbmRs ZeKAmQogc3RhdGljIGlubGluZSBpbnQgZG1hcl9kZXZpY2VfcmVtb3ZlKGFjcGlfaGFuZGxlIGhh bmRsZSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBeCm1ha2VbMl06ICoq KiBbYXJjaC94ODYva2VybmVsL3BjaS1kbWEub10gRXJyb3IgMQptYWtlWzFdOiAqKiogW2FyY2gv eDg2L2tlcm5lbF0gRXJyb3IgMgptYWtlOiAqKiogW2FyY2gveDg2XSBFcnJvciAyCgpTaWduZWQt b2ZmLWJ5OiBKaWFuZyBMaXUgPGppYW5nLmxpdUBsaW51eC5pbnRlbC5jb20+Ci0tLQpIaSBKb2Vy ZywKCUNvdWxkIHlvdSBwbGVhc2UgaGVscCB0byBtZXJnZSBvciBmb2xkIHRoaXMgcGF0Y2ggdG8g Zml4IHRoZQpidWlsZCBlcnJvcj8KUmVnYXJkcyEKR2VycnkKLS0tCiBpbmNsdWRlL2xpbnV4L2Rt YXIuaCB8ICAgIDQgKystLQogMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMiBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L2RtYXIuaCBiL2luY2x1ZGUvbGlu dXgvZG1hci5oCmluZGV4IDljMDZiYjRiNWIxNC4uNTk0ZDRhYzc5ZTc1IDEwMDY0NAotLS0gYS9p bmNsdWRlL2xpbnV4L2RtYXIuaAorKysgYi9pbmNsdWRlL2xpbnV4L2RtYXIuaApAQCAtMTY1LDEy ICsxNjUsMTIgQEAgc3RhdGljIGlubGluZSBpbnQgZG1hcl9pcl9ob3RwbHVnKHN0cnVjdCBkbWFy X2RyaGRfdW5pdCAqZG1hcnUsIGJvb2wgaW5zZXJ0KQogCiAjZWxzZSAvKiBDT05GSUdfRE1BUl9U QUJMRSAqLwogCi1zdGF0aWMgaW5saW5lIGludCBkbWFyX2RldmljZV9hZGQoYWNwaV9oYW5kbGUg aGFuZGxlKQorc3RhdGljIGlubGluZSBpbnQgZG1hcl9kZXZpY2VfYWRkKHZvaWQgKmhhbmRsZSkK IHsKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGlubGluZSBpbnQgZG1hcl9kZXZpY2VfcmVtb3Zl KGFjcGlfaGFuZGxlIGhhbmRsZSkKK3N0YXRpYyBpbmxpbmUgaW50IGRtYXJfZGV2aWNlX3JlbW92 ZSh2b2lkICpoYW5kbGUpCiB7CiAJcmV0dXJuIDA7CiB9Ci0tIAoxLjcuMTAuNAoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KaW9tbXUgbWFpbGluZyBsaXN0 CmlvbW11QGxpc3RzLmxpbnV4LWZvdW5kYXRpb24ub3JnCmh0dHBzOi8vbGlzdHMubGludXhmb3Vu ZGF0aW9uLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lvbW11 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiang Liu Date: Thu, 24 Jul 2014 02:33:27 +0000 Subject: iommu/vt-d: Fix build error caused by unknown definition of acpi_handle Message-Id: <1406169208-11097-1-git-send-email-jiang.liu@linux.intel.com> List-Id: References: <20140723153420.GC14017@8bytes.org> In-Reply-To: <20140723153420.GC14017@8bytes.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: Joerg Roedel , David Woodhouse , Yinghai Lu , Bjorn Helgaas , Dan Williams , Vinod Koul , "Rafael J . Wysocki" Cc: Jiang Liu , Ashok Raj , Yijing Wang , Tony Luck , iommu@lists.linux-foundation.org, linux-pci@vger.kernel.org, linux-hotplug@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org When both CONFIG_ACPI and CONFIG_DMAR_TABLE are disabled, commit "Implement DMAR unit hotplug framework" causes build failure as below: CC arch/x86/kernel/pci-dma.o In file included from arch/x86/kernel/pci-dma.c:3:0: include/linux/dmar.h:168:35: error: unknown type name ‘acpi_handle’ static inline int dmar_device_add(acpi_handle handle) ^ include/linux/dmar.h:173:38: error: unknown type name ‘acpi_handle’ static inline int dmar_device_remove(acpi_handle handle) ^ make[2]: *** [arch/x86/kernel/pci-dma.o] Error 1 make[1]: *** [arch/x86/kernel] Error 2 make: *** [arch/x86] Error 2 Signed-off-by: Jiang Liu --- Hi Joerg, Could you please help to merge or fold this patch to fix the build error? Regards! Gerry --- include/linux/dmar.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/dmar.h b/include/linux/dmar.h index 9c06bb4b5b14..594d4ac79e75 100644 --- a/include/linux/dmar.h +++ b/include/linux/dmar.h @@ -165,12 +165,12 @@ static inline int dmar_ir_hotplug(struct dmar_drhd_unit *dmaru, bool insert) #else /* CONFIG_DMAR_TABLE */ -static inline int dmar_device_add(acpi_handle handle) +static inline int dmar_device_add(void *handle) { return 0; } -static inline int dmar_device_remove(acpi_handle handle) +static inline int dmar_device_remove(void *handle) { return 0; } -- 1.7.10.4