From: Shawn Guo Date: Thu, 12 Jun 2014 02:56:24 +0000 (+0800) Subject: ENGR00317981: busfreq: fix the use of MT_MEMORY_NONCACHED X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=c07385cbc1f477f33fded65a4274afc74dc1010a;p=karo-tx-linux.git ENGR00317981: busfreq: fix the use of MT_MEMORY_NONCACHED Since commit 2e2c9de207be (ARM: add permission annotations to MT_MEMORY* mapping types), MT_MEMORY_NONCACHED is not available any more. Thus, we see following build error. CC arch/arm/mach-imx/busfreq_ddr3.o arch/arm/mach-imx/busfreq_ddr3.c: In function ‘init_mmdc_settings’: arch/arm/mach-imx/busfreq_ddr3.c:464:7: error: ‘MT_MEMORY_NONCACHED’ undeclared (first use in this function) Fix it by using the new enum MT_MEMORY_RWX_NONCACHED. Signed-off-by: Shawn Guo --- diff --git a/arch/arm/mach-imx/busfreq_ddr3.c b/arch/arm/mach-imx/busfreq_ddr3.c index 6ecd2f8a4407..ef4db2c8756f 100644 --- a/arch/arm/mach-imx/busfreq_ddr3.c +++ b/arch/arm/mach-imx/busfreq_ddr3.c @@ -461,7 +461,7 @@ int init_mmdc_settings(struct platform_device *busfreq_pdev) */ ddr_freq_change_iram_base = __arm_ioremap(iram_paddr, DDR_FREQ_CHANGE_SIZE, - MT_MEMORY_NONCACHED); + MT_MEMORY_RWX_NONCACHED); mx6_change_ddr_freq = (void *)fncpy(ddr_freq_change_iram_base, &mx6_ddr3_freq_change, DDR_FREQ_CHANGE_SIZE);