Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit daedaa33 authored by Lu Baolu's avatar Lu Baolu Committed by Joerg Roedel
Browse files

iommu/vtd: Cleanup dma_remapping.h header 



Commit e61d98d8 ("x64, x2apic/intr-remap: Intel vt-d, IOMMU
code reorganization") moved dma_remapping.h from drivers/pci/ to
current place. It is entirely VT-d specific, but uses a generic
name. This merges dma_remapping.h with include/linux/intel-iommu.h
and removes dma_remapping.h as the result.

Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Cc: Sohil Mehta <sohil.mehta@intel.com>
Suggested-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarLiu, Yi L <yi.l.liu@intel.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent ccda4af0

arch/x86/kernel/tboot.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ 
 *

 *

 */

 */





#include <linux/dma_remapping.h>

#include <linux/intel-iommu.h>

#include <linux/init_task.h>

#include <linux/init_task.h>

#include <linux/spinlock.h>

#include <linux/spinlock.h>

#include <linux/export.h>

#include <linux/export.h>

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ 
 *

 *

 */

 */





#include <linux/dma_remapping.h>

#include <linux/intel-iommu.h>

#include <linux/reservation.h>

#include <linux/reservation.h>

#include <linux/sync_file.h>

#include <linux/sync_file.h>

#include <linux/uaccess.h>

#include <linux/uaccess.h>

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -47,7 +47,7 @@ 
#include <drm/drm_plane_helper.h>

#include <drm/drm_plane_helper.h>

#include <drm/drm_rect.h>

#include <drm/drm_rect.h>

#include <drm/drm_atomic_uapi.h>

#include <drm/drm_atomic_uapi.h>

#include <linux/dma_remapping.h>

#include <linux/intel-iommu.h>

#include <linux/reservation.h>

#include <linux/reservation.h>





/* Primary plane formats for gen <= 3 */

/* Primary plane formats for gen <= 3 */

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include <drm/ttm/ttm_placement.h>

#include <drm/ttm/ttm_placement.h>

#include <drm/ttm/ttm_bo_driver.h>

#include <drm/ttm/ttm_bo_driver.h>

#include <drm/ttm/ttm_module.h>

#include <drm/ttm/ttm_module.h>

#include <linux/dma_remapping.h>

#include <linux/intel-iommu.h>





#define VMWGFX_DRIVER_DESC "Linux drm driver for VMware graphics devices"

#define VMWGFX_DRIVER_DESC "Linux drm driver for VMware graphics devices"

#define VMWGFX_CHIP_SVGAII 0

#define VMWGFX_CHIP_SVGAII 0

drivers/misc/mic/scif/scif_rma.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 
 * Intel SCIF driver.

 * Intel SCIF driver.

 *

 *

 */

 */

#include <linux/dma_remapping.h>

#include <linux/intel-iommu.h>

#include <linux/pagemap.h>

#include <linux/pagemap.h>

#include <linux/sched/mm.h>

#include <linux/sched/mm.h>

#include <linux/sched/signal.h>

#include <linux/sched/signal.h>