diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-11-24 16:32:11 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-24 16:32:11 +0900 |
| commit | 49fb2cd2571e0134e5a12c5abab227696e4940c7 (patch) | |
| tree | 9a77364e988ef3f3af24feee3f5bb91bd0c34129 /arch/sh/mm/kmap.c | |
| parent | dfc349402de8e95f6a42e8341e9ea193b718eee3 (diff) | |
| parent | 260af56271f79da0e37faa5a99b1786b221297e5 (diff) | |
| download | talos-op-linux-49fb2cd2571e0134e5a12c5abab227696e4940c7.tar.gz talos-op-linux-49fb2cd2571e0134e5a12c5abab227696e4940c7.zip | |
Merge branch 'master' into sh/st-integration
Diffstat (limited to 'arch/sh/mm/kmap.c')
| -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))); |
