diff options
| author |   David S. Miller <davem@sunset.sfo1.dsl.speakeasy.net> | 2006-06-01 17:47:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.sfo1.dsl.speakeasy.net> | 2006-06-01 17:47:25 -0700 |
| commit | 0b0968a3e691771bf87e1ce747b2c7d23b5526c8 (patch) | |
| tree | 71787e376b7aef54b48e99d15a0fc11c7cf7ee8d /include/asm-mips | |
| parent | [SPARC64]: Make smp_processor_id() functional before start_kernel() (diff) | |
| download | linux-dev-0b0968a3e691771bf87e1ce747b2c7d23b5526c8.tar.xz linux-dev-0b0968a3e691771bf87e1ce747b2c7d23b5526c8.zip | |
[SPARC64]: Fix D-cache corruption in mremap
If we move a mapping from one virtual address to another,
and this changes the virtual color of the mapping to those
pages, we can see corrupt data due to D-cache aliasing.
Check for and deal with this by overriding the move_pte()
macro. Set things up so that other platforms can cleanly
override the move_pte() macro too.
Signed-off-by: David S. Miller <davem@davemloft.net>
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 702a28fa7a34..69cebbd9f3e0 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); |