Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-30 08:01:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

iommu/vt-d: Fix compile error [-Werror=implicit-function-declaration]

Browse Source 
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: f2dd871799 ("iommu/vt-d: Add qi_submit trace event")
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/20210130151907.3929148-1-baolu.lu@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Lu Baolu 2021-01-30 23:19:07 +08:00 committed by Joerg Roedel
parent 3aa7c62cb7
commit e1ed66ac30
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/iommu/intel/Makefile
View File

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_DMAR_TABLE) += dmar.o obj-$(CONFIG_DMAR_TABLE) += dmar.o
obj-$(CONFIG_INTEL_IOMMU) += iommu.o pasid.o obj-$(CONFIG_INTEL_IOMMU) += iommu.o pasid.o
obj-$(CONFIG_INTEL_IOMMU) += trace.o obj-$(CONFIG_DMAR_TABLE) += trace.o
obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += debugfs.o obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += debugfs.o
obj-$(CONFIG_INTEL_IOMMU_SVM) += svm.o obj-$(CONFIG_INTEL_IOMMU_SVM) += svm.o
obj-$(CONFIG_IRQ_REMAP) += irq_remapping.o obj-$(CONFIG_IRQ_REMAP) += irq_remapping.o

1
drivers/iommu/intel/iommu.c
View File

@ -44,7 +44,6 @@
#include <asm/irq_remapping.h> #include <asm/irq_remapping.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/iommu.h> #include <asm/iommu.h>
#include <trace/events/intel_iommu.h>
#include "../irq_remapping.h" #include "../irq_remapping.h"
#include "pasid.h" #include "pasid.h"

2
include/trace/events/intel_iommu.h
View File

@ -6,7 +6,6 @@
* *
* Author: Lu Baolu <baolu.lu@linux.intel.com> * Author: Lu Baolu <baolu.lu@linux.intel.com>
*/ */
#ifdef CONFIG_INTEL_IOMMU
#undef TRACE_SYSTEM #undef TRACE_SYSTEM
#define TRACE_SYSTEM intel_iommu #define TRACE_SYSTEM intel_iommu
@ -176,4 +175,3 @@ TRACE_EVENT(qi_submit,
/* This part must be outside protection */ /* This part must be outside protection */
#include <trace/define_trace.h> #include <trace/define_trace.h>
#endif /* CONFIG_INTEL_IOMMU */