From 198f88dc6bc00b27838c6c7184f83c3621edaec6 Mon Sep 17 00:00:00 2001 From: Richard Kuo Date: Tue, 5 Feb 2013 14:23:37 -0600 Subject: [PATCH] --- yaml --- r: 367952 b: refs/heads/master c: f167063a0c4e97dfbd8e42df76e71022bb2bdb7f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/hexagon/include/asm/vm_mmu.h | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b0437be58c09..509b44eb75bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b3c744c3bcaab14ad2cc0f067d76c2f119085a5 +refs/heads/master: f167063a0c4e97dfbd8e42df76e71022bb2bdb7f diff --git a/trunk/arch/hexagon/include/asm/vm_mmu.h b/trunk/arch/hexagon/include/asm/vm_mmu.h index 9a94de7969bb..e67b573cfef0 100644 --- a/trunk/arch/hexagon/include/asm/vm_mmu.h +++ b/trunk/arch/hexagon/include/asm/vm_mmu.h @@ -68,14 +68,13 @@ #define __HEXAGON_C_WB 0x0 /* Write-back, no L2 */ #define __HEXAGON_C_WT 0x1 /* Write-through, no L2 */ +#define __HEXAGON_C_UNC 0x6 /* Uncached memory */ +#if CONFIG_HEXAGON_ARCH_VERSION >= 2 #define __HEXAGON_C_DEV 0x4 /* Device register space */ -#define __HEXAGON_C_WT_L2 0x5 /* Write-through, with L2 */ -/* this really should be #if CONFIG_HEXAGON_ARCH = 2 but that's not defined */ -#if defined(CONFIG_HEXAGON_COMET) || defined(CONFIG_QDSP6_ST1) -#define __HEXAGON_C_UNC __HEXAGON_C_DEV #else -#define __HEXAGON_C_UNC 0x6 /* Uncached memory */ +#define __HEXAGON_C_DEV __HEXAGON_C_UNC #endif +#define __HEXAGON_C_WT_L2 0x5 /* Write-through, with L2 */ #define __HEXAGON_C_WB_L2 0x7 /* Write-back, with L2 */ /*