diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2009-09-09 17:14:19 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-09 17:14:19 +0900 |
| commit | f9e2bdfdbb4c9da13422b349227be8c7b41dbd44 (patch) | |
| tree | 0cda3a72cbf51cf4e907e0cbef4dce24a6d08b7e /arch/sh/mm | |
| parent | sh: Fix up redundant cache flushing for PAGE_SIZE > 4k. (diff) | |
| download | linux-dev-f9e2bdfdbb4c9da13422b349227be8c7b41dbd44.tar.xz linux-dev-f9e2bdfdbb4c9da13422b349227be8c7b41dbd44.zip | |
sh: Factor in cpu id for selection of cache colour fixmap.
In the SMP VIPT case the page copy/clear ops still perform colouring,
care needs to be taken that CPUs don't end up stepping on each other,
so we give them a bit of room to work with.
At the same time, we reduce the worst-case colouring given that these
pages are always consumed.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/mm')
| -rw-r--r-- | arch/sh/mm/kmap.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh/mm/kmap.c b/arch/sh/mm/kmap.c index 16e01b5fed04..15d74ea42094 100644 --- a/arch/sh/mm/kmap.c +++ b/arch/sh/mm/kmap.c @@ -39,7 +39,9 @@ void *kmap_coherent(struct page *page, unsigned long addr) pagefault_disable(); idx = FIX_CMAP_END - - ((addr & current_cpu_data.dcache.alias_mask) >> PAGE_SHIFT); + (((addr >> PAGE_SHIFT) & (FIX_N_COLOURS - 1)) + + (FIX_N_COLOURS * smp_processor_id())); + vaddr = __fix_to_virt(idx); BUG_ON(!pte_none(*(kmap_coherent_pte - idx))); |