diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 |
| commit | b0c4e148bd591629749d02a8fbc8d81c26d548cf (patch) | |
| tree | 3e2142635f3dc2ceeae870ead2dceab7b9c6def1 /include/asm-mips/pgtable-bits.h | |
| parent | 5615ca7906aefbdc3318604c89db5931d0a25910 (diff) | |
| parent | be15cd72d256e5eb3261a781b8507fac83ab33f6 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-mips/pgtable-bits.h')
| -rw-r--r-- | include/asm-mips/pgtable-bits.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-mips/pgtable-bits.h b/include/asm-mips/pgtable-bits.h index 3aad751ccd5f..01e76e932e3f 100644 --- a/include/asm-mips/pgtable-bits.h +++ b/include/asm-mips/pgtable-bits.h | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | * unpredictable things. The code (when it is written) to deal with | 33 | * unpredictable things. The code (when it is written) to deal with |
| 34 | * this problem will be in the update_mmu_cache() code for the r4k. | 34 | * this problem will be in the update_mmu_cache() code for the r4k. |
| 35 | */ | 35 | */ |
| 36 | #if defined(CONFIG_CPU_MIPS32) && defined(CONFIG_64BIT_PHYS_ADDR) | 36 | #if defined(CONFIG_CPU_MIPS32_R1) && defined(CONFIG_64BIT_PHYS_ADDR) |
| 37 | 37 | ||
| 38 | #define _PAGE_PRESENT (1<<6) /* implemented in software */ | 38 | #define _PAGE_PRESENT (1<<6) /* implemented in software */ |
| 39 | #define _PAGE_READ (1<<7) /* implemented in software */ | 39 | #define _PAGE_READ (1<<7) /* implemented in software */ |
| @@ -123,7 +123,7 @@ | |||
| 123 | 123 | ||
| 124 | #endif | 124 | #endif |
| 125 | #endif | 125 | #endif |
| 126 | #endif /* defined(CONFIG_CPU_MIPS32) && defined(CONFIG_64BIT_PHYS_ADDR) */ | 126 | #endif /* defined(CONFIG_CPU_MIPS32_R1) && defined(CONFIG_64BIT_PHYS_ADDR) */ |
| 127 | 127 | ||
| 128 | #define __READABLE (_PAGE_READ | _PAGE_SILENT_READ | _PAGE_ACCESSED) | 128 | #define __READABLE (_PAGE_READ | _PAGE_SILENT_READ | _PAGE_ACCESSED) |
| 129 | #define __WRITEABLE (_PAGE_WRITE | _PAGE_SILENT_WRITE | _PAGE_MODIFIED) | 129 | #define __WRITEABLE (_PAGE_WRITE | _PAGE_SILENT_WRITE | _PAGE_MODIFIED) |
| @@ -140,7 +140,7 @@ | |||
| 140 | #define PAGE_CACHABLE_DEFAULT _CACHE_CACHABLE_COW | 140 | #define PAGE_CACHABLE_DEFAULT _CACHE_CACHABLE_COW |
| 141 | #endif | 141 | #endif |
| 142 | 142 | ||
| 143 | #if defined(CONFIG_CPU_MIPS32) && defined(CONFIG_64BIT_PHYS_ADDR) | 143 | #if defined(CONFIG_CPU_MIPS32_R1) && defined(CONFIG_64BIT_PHYS_ADDR) |
| 144 | #define CONF_CM_DEFAULT (PAGE_CACHABLE_DEFAULT >> 3) | 144 | #define CONF_CM_DEFAULT (PAGE_CACHABLE_DEFAULT >> 3) |
| 145 | #else | 145 | #else |
| 146 | #define CONF_CM_DEFAULT (PAGE_CACHABLE_DEFAULT >> 9) | 146 | #define CONF_CM_DEFAULT (PAGE_CACHABLE_DEFAULT >> 9) |