| Message ID | 1406169208-11097-1-git-send-email-jiang.liu@linux.intel.com |
|---|---|
| State | Not Applicable |
| Headers | show |
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; }
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 <jiang.liu@linux.intel.com> --- 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(-)