diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-24 23:01:03 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-24 23:01:03 +0100 |
| commit | c98536343efee5087773751d2a26899ed302acf3 (patch) | |
| tree | 464ae8b698ddbb2268e2d1d1f613d75c9ffb3dba /arch/arm64/include/asm/memory.h | |
| parent | b54021f4075c0efb204da4e9c830197d8069da30 (diff) | |
| parent | bcddae4453f74e9d1dbc8db78c5c9bc552c600cb (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Conflicts:
drivers/of/fdt.c
Diffstat (limited to 'arch/arm64/include/asm/memory.h')
| -rw-r--r-- | arch/arm64/include/asm/memory.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index 15e3f189ee03..71cd41644279 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -97,6 +97,12 @@ #define MT_NORMAL_NC 3 #define MT_NORMAL 4 +/* + * Memory types for Stage-2 translation + */ +#define MT_S2_NORMAL 0xf +#define MT_S2_DEVICE_nGnRE 0x1 + #ifndef __ASSEMBLY__ extern phys_addr_t memstart_addr; |