openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc: remove the second argument of k[un]map_atomic() 

Signed-off-by: Cong Wang <amwang@redhat.com>
This commit is contained in:
Cong Wang 2011-11-25 23:14:16 +08:00 committed by Cong Wang
parent 9c02048fcd
commit 2480b20892
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/kvm/book3s_pr.c
View File

@ -227,14 +227,14 @@ static void kvmppc_patch_dcbz(struct kvm_vcpu *vcpu, struct kvmppc_pte *pte)
hpage_offset /= 4; hpage_offset /= 4;
get_page(hpage); get_page(hpage);
page = kmap_atomic(hpage, KM_USER0); page = kmap_atomic(hpage);
/* patch dcbz into reserved instruction, so we trap */ /* patch dcbz into reserved instruction, so we trap */
for (i=hpage_offset; i < hpage_offset + (HW_PAGE_SIZE / 4); i++) for (i=hpage_offset; i < hpage_offset + (HW_PAGE_SIZE / 4); i++)
if ((page[i] & 0xff0007ff) == INS_DCBZ) if ((page[i] & 0xff0007ff) == INS_DCBZ)
page[i] &= 0xfffffff7; page[i] &= 0xfffffff7;
kunmap_atomic(page, KM_USER0); kunmap_atomic(page);
put_page(hpage); put_page(hpage);
} }

5
arch/powerpc/mm/dma-noncoherent.c
View File

@ -365,12 +365,11 @@ static inline void __dma_sync_page_highmem(struct page *page,
local_irq_save(flags); local_irq_save(flags);
do { do {
start = (unsigned long)kmap_atomic(page + seg_nr, start = (unsigned long)kmap_atomic(page + seg_nr) + seg_offset;
KM_PPC_SYNC_PAGE) + seg_offset;
/* Sync this buffer segment */ /* Sync this buffer segment */
__dma_sync((void *)start, seg_size, direction); __dma_sync((void *)start, seg_size, direction);
kunmap_atomic((void *)start, KM_PPC_SYNC_PAGE); kunmap_atomic((void *)start);
seg_nr++; seg_nr++;
/* Calculate next buffer segment size */ /* Calculate next buffer segment size */

4
arch/powerpc/mm/hugetlbpage.c
View File

@ -910,9 +910,9 @@ void flush_dcache_icache_hugepage(struct page *page)
if (!PageHighMem(page)) { if (!PageHighMem(page)) {
__flush_dcache_icache(page_address(page+i)); __flush_dcache_icache(page_address(page+i));
} else { } else {
start = kmap_atomic(page+i, KM_PPC_SYNC_ICACHE); start = kmap_atomic(page+i);
__flush_dcache_icache(start); __flush_dcache_icache(start);
kunmap_atomic(start, KM_PPC_SYNC_ICACHE); kunmap_atomic(start);
} }
} }
} }

4
arch/powerpc/mm/mem.c
View File

@ -458,9 +458,9 @@ void flush_dcache_icache_page(struct page *page)
#endif #endif
#ifdef CONFIG_BOOKE #ifdef CONFIG_BOOKE
{ {
void *start = kmap_atomic(page, KM_PPC_SYNC_ICACHE); void *start = kmap_atomic(page);
__flush_dcache_icache(start); __flush_dcache_icache(start);
kunmap_atomic(start, KM_PPC_SYNC_ICACHE); kunmap_atomic(start);
} }
#elif defined(CONFIG_8xx) || defined(CONFIG_PPC64) #elif defined(CONFIG_8xx) || defined(CONFIG_PPC64)
/* On 8xx there is no need to kmap since highmem is not supported */ /* On 8xx there is no need to kmap since highmem is not supported */