diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-03 01:02:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-03 01:02:22 +0200 |
| commit | 48e49ead3e92d53196a78c42cf24c0eed6ca98dd (patch) | |
| tree | 021e1b1616258cfcee73556fa4095db5663afc61 /include/asm-mips | |
| parent | [PATCH] slab.c: fix offslab_limit bug (diff) | |
| parent | [SPARC64]: Fix D-cache corruption in mremap (diff) | |
| download | linux-48e49ead3e92d53196a78c42cf24c0eed6ca98dd.tar.xz linux-48e49ead3e92d53196a78c42cf24c0eed6ca98dd.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix D-cache corruption in mremap
[SPARC64]: Make smp_processor_id() functional before start_kernel()
Diffstat (limited to 'include/asm-mips')
| -rw-r--r-- | include/asm-mips/pgtable.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/asm-mips/pgtable.h b/include/asm-mips/pgtable.h index 174a3cda8c26..f80fe75c7800 100644 --- a/include/asm-mips/pgtable.h +++ b/include/asm-mips/pgtable.h @@ -70,7 +70,15 @@ extern unsigned long zero_page_mask; #define ZERO_PAGE(vaddr) \ (virt_to_page(empty_zero_page + (((unsigned long)(vaddr)) & zero_page_mask))) -#define __HAVE_ARCH_MULTIPLE_ZERO_PAGE +#define __HAVE_ARCH_MOVE_PTE +#define move_pte(pte, prot, old_addr, new_addr) \ +({ \ + pte_t newpte = (pte); \ + if (pte_present(pte) && pfn_valid(pte_pfn(pte)) && \ + pte_page(pte) == ZERO_PAGE(old_addr)) \ + newpte = mk_pte(ZERO_PAGE(new_addr), (prot)); \ + newpte; \ +}) extern void paging_init(void); |