diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-04 08:42:17 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-04 08:42:17 -0400 |
| commit | 862cff63781e3a9de85d8947c82d55f4cc95572b (patch) | |
| tree | ab47b1597e3ef193590da98147e494b2d702bac2 /include/asm-arm/pgtable-hwdef.h | |
| parent | 7819d64e31a685e35e4819515c84168d0879816e (diff) | |
| parent | c16226a1c75042bfdc50bd2921d5919f6267ba51 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'include/asm-arm/pgtable-hwdef.h')
| -rw-r--r-- | include/asm-arm/pgtable-hwdef.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/pgtable-hwdef.h b/include/asm-arm/pgtable-hwdef.h index 1d033495cc75..1bc1f997bda2 100644 --- a/include/asm-arm/pgtable-hwdef.h +++ b/include/asm-arm/pgtable-hwdef.h | |||
| @@ -73,6 +73,7 @@ | |||
| 73 | #define PTE_EXT_AP_URW_SRW (PTE_EXT_AP1|PTE_EXT_AP0) | 73 | #define PTE_EXT_AP_URW_SRW (PTE_EXT_AP1|PTE_EXT_AP0) |
| 74 | #define PTE_EXT_TEX(x) ((x) << 6) /* v5 */ | 74 | #define PTE_EXT_TEX(x) ((x) << 6) /* v5 */ |
| 75 | #define PTE_EXT_APX (1 << 9) /* v6 */ | 75 | #define PTE_EXT_APX (1 << 9) /* v6 */ |
| 76 | #define PTE_EXT_COHERENT (1 << 9) /* XScale3 */ | ||
| 76 | #define PTE_EXT_SHARED (1 << 10) /* v6 */ | 77 | #define PTE_EXT_SHARED (1 << 10) /* v6 */ |
| 77 | #define PTE_EXT_NG (1 << 11) /* v6 */ | 78 | #define PTE_EXT_NG (1 << 11) /* v6 */ |
| 78 | 79 | ||