diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-11 01:26:12 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-11 01:26:12 -0800 |
| commit | e3f4e1cbc341bc2020241d8119bd078db3ec3b85 (patch) | |
| tree | 8b23624cc792f60d0bf86d787c3514cf0fb04418 /arch/sh/mm/kmap.c | |
| parent | adfe67ddffbea51322b118896178bd71aaa4b4d8 (diff) | |
| parent | d71cb81af3817193bc605de061da0499934263a6 (diff) | |
| download | linux-e3f4e1cbc341bc2020241d8119bd078db3ec3b85.tar.gz linux-e3f4e1cbc341bc2020241d8119bd078db3ec3b85.tar.bz2 linux-e3f4e1cbc341bc2020241d8119bd078db3ec3b85.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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))); |