diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:30:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:30:54 -0400 |
| commit | 0ed368c71aa65cba8d349432bd4dab4a9a2eb39c (patch) | |
| tree | 7746534bafd57f6764bda8f26efc3929a4acf914 /include/asm-mips/pgtable-bits.h | |
| parent | 7aaaec38fcd9ef3172e69f8c19f20113830a8498 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/kconfig
Diffstat (limited to 'include/asm-mips/pgtable-bits.h')
| -rw-r--r-- | include/asm-mips/pgtable-bits.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-mips/pgtable-bits.h b/include/asm-mips/pgtable-bits.h index 60e2f9338fcd..51b34a48c84a 100644 --- a/include/asm-mips/pgtable-bits.h +++ b/include/asm-mips/pgtable-bits.h | |||
| @@ -134,6 +134,4 @@ | |||
| 134 | 134 | ||
| 135 | #define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_ACCESSED | _PAGE_MODIFIED | _CACHE_MASK) | 135 | #define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_ACCESSED | _PAGE_MODIFIED | _CACHE_MASK) |
| 136 | 136 | ||
| 137 | #define CONF_CM_DEFAULT (PAGE_CACHABLE_DEFAULT>>_CACHE_SHIFT) | ||
| 138 | |||
| 139 | #endif /* _ASM_PGTABLE_BITS_H */ | 137 | #endif /* _ASM_PGTABLE_BITS_H */ |