diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-28 23:13:36 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-28 23:13:36 -0400 |
| commit | ab11d1ea281e85895369ef57c5259ad8a432fabb (patch) | |
| tree | 684147479c6a8bb2fbed21bdcf12de1dd519c730 /include/asm-mips/pgtable.h | |
| parent | 952ecef7a0479049c8abb7c34a688ec2981ceadd (diff) | |
| parent | 664cceb0093b755739e56572b836a99104ee8a75 (diff) | |
Merge by hand from Linus' tree.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-mips/pgtable.h')
| -rw-r--r-- | include/asm-mips/pgtable.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-mips/pgtable.h b/include/asm-mips/pgtable.h index cbd1672c94cb..eaf5d9b3a0e1 100644 --- a/include/asm-mips/pgtable.h +++ b/include/asm-mips/pgtable.h | |||
| @@ -68,6 +68,8 @@ extern unsigned long zero_page_mask; | |||
| 68 | #define ZERO_PAGE(vaddr) \ | 68 | #define ZERO_PAGE(vaddr) \ |
| 69 | (virt_to_page(empty_zero_page + (((unsigned long)(vaddr)) & zero_page_mask))) | 69 | (virt_to_page(empty_zero_page + (((unsigned long)(vaddr)) & zero_page_mask))) |
| 70 | 70 | ||
| 71 | #define __HAVE_ARCH_MULTIPLE_ZERO_PAGE | ||
| 72 | |||
| 71 | extern void paging_init(void); | 73 | extern void paging_init(void); |
| 72 | 74 | ||
| 73 | /* | 75 | /* |