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

Commit bc45092a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu: move iommu header files to new locations"

parents c4251672 9435beaa

drivers/gpu/msm/kgsl_iommu.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#ifndef __KGSL_IOMMU_H

#define __KGSL_IOMMU_H



#include <mach/iommu.h>

#include <linux/qcom_iommu.h>



/* Pagetable virtual base */

#define KGSL_PAGETABLE_BASE     0x10000000

drivers/gpu/msm/kgsl_mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/slab.h>

#include <linux/sched.h>

#include <linux/iommu.h>

#include <mach/iommu.h>

#include <linux/qcom_iommu.h>

#include <linux/types.h>



#include "kgsl.h"

drivers/gpu/msm/kgsl_mmu.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#ifndef __KGSL_MMU_H

#define __KGSL_MMU_H



#include <mach/iommu.h>

#include <linux/qcom_iommu.h>

#include "kgsl_iommu.h"

/*

 * These defines control the address range for allocations that

drivers/iommu/msm_iommu-v0.c

+4 −4
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ 
#include <asm/cacheflush.h>

#include <asm/sizes.h>



#include <mach/iommu_perfmon.h>

#include <mach/iommu_hw-v0.h>

#include <mach/msm_iommu_priv.h>

#include <mach/iommu.h>

#include "msm_iommu_perfmon.h"

#include "msm_iommu_hw-v0.h"

#include "msm_iommu_priv.h"

#include <linux/qcom_iommu.h>

#include <mach/msm_bus.h>



#include <soc/qcom/smem.h>

drivers/iommu/msm_iommu-v1.c

+4 −4
Original line number Diff line number Diff line
@@ -29,12 +29,12 @@ 
#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/regulator/consumer.h>

#include <linux/qcom_iommu.h>

#include <asm/sizes.h>



#include <mach/iommu_hw-v1.h>

#include <mach/iommu.h>

#include <mach/msm_iommu_priv.h>

#include <mach/iommu_perfmon.h>

#include "msm_iommu_hw-v1.h"

#include "msm_iommu_priv.h"

#include "msm_iommu_perfmon.h"

#include "msm_iommu_pagetable.h"



#ifdef CONFIG_IOMMU_LPAE