Skip to content

Commit e1ed66a

Browse files
LuBaolujoergroedel
authored andcommitted
iommu/vt-d: Fix compile error [-Werror=implicit-function-declaration]
trace_qi_submit() could be used when interrupt remapping is supported, but DMA remapping is not. In this case, the following compile error occurs. ../drivers/iommu/intel/dmar.c: In function 'qi_submit_sync': ../drivers/iommu/intel/dmar.c:1311:3: error: implicit declaration of function 'trace_qi_submit'; did you mean 'ftrace_nmi_exit'? [-Werror=implicit-function-declaration] trace_qi_submit(iommu, desc[i].qw0, desc[i].qw1, ^~~~~~~~~~~~~~~ ftrace_nmi_exit Fixes: f2dd871 ("iommu/vt-d: Add qi_submit trace event") Reported-by: kernel test robot <[email protected]> Reported-by: Randy Dunlap <[email protected]> Signed-off-by: Lu Baolu <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Joerg Roedel <[email protected]>
1 parent 3aa7c62 commit e1ed66a

File tree

3 files changed

+1
-4
lines changed

3 files changed

+1
-4
lines changed

drivers/iommu/intel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
obj-$(CONFIG_DMAR_TABLE) += dmar.o
33
obj-$(CONFIG_INTEL_IOMMU) += iommu.o pasid.o
4-
obj-$(CONFIG_INTEL_IOMMU) += trace.o
4+
obj-$(CONFIG_DMAR_TABLE) += trace.o
55
obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += debugfs.o
66
obj-$(CONFIG_INTEL_IOMMU_SVM) += svm.o
77
obj-$(CONFIG_IRQ_REMAP) += irq_remapping.o

drivers/iommu/intel/iommu.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
#include <asm/irq_remapping.h>
4545
#include <asm/cacheflush.h>
4646
#include <asm/iommu.h>
47-
#include <trace/events/intel_iommu.h>
4847

4948
#include "../irq_remapping.h"
5049
#include "pasid.h"

include/trace/events/intel_iommu.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*
77
* Author: Lu Baolu <[email protected]>
88
*/
9-
#ifdef CONFIG_INTEL_IOMMU
109
#undef TRACE_SYSTEM
1110
#define TRACE_SYSTEM intel_iommu
1211

@@ -176,4 +175,3 @@ TRACE_EVENT(qi_submit,
176175

177176
/* This part must be outside protection */
178177
#include <trace/define_trace.h>
179-
#endif /* CONFIG_INTEL_IOMMU */

0 commit comments

Comments
 (0)