diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:29:11 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:29:11 +0200 |
commit | 1e74f9cbbba5348a6c58988cce0f19d6ef887cc8 (patch) | |
tree | 47fcfdba6a17a02cf6745146ebb2ae435405ab1a /include/asm-mips/pgtable-bits.h | |
parent | 31a72bce0bd6f3e0114009288bccbc96376eeeca (diff) | |
parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) | |
download | op-kernel-dev-1e74f9cbbba5348a6c58988cce0f19d6ef887cc8.zip op-kernel-dev-1e74f9cbbba5348a6c58988cce0f19d6ef887cc8.tar.gz |
Merge branch 'linus' into core/rcu
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 60e2f93..51b34a4 100644 --- a/include/asm-mips/pgtable-bits.h +++ b/include/asm-mips/pgtable-bits.h @@ -134,6 +134,4 @@ #define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_ACCESSED | _PAGE_MODIFIED | _CACHE_MASK) -#define CONF_CM_DEFAULT (PAGE_CACHABLE_DEFAULT>>_CACHE_SHIFT) - #endif /* _ASM_PGTABLE_BITS_H */ |