Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2480b208 authored by Cong Wang's avatar Cong Wang Committed by Cong Wang
Browse files

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



Signed-off-by: default avatarCong Wang <amwang@redhat.com>
parent 9c02048f

arch/powerpc/kvm/book3s_pr.c

+2 −2
Original line number Diff line number Diff line
@@ -227,14 +227,14 @@ static void kvmppc_patch_dcbz(struct kvm_vcpu *vcpu, struct kvmppc_pte *pte) 
	hpage_offset /= 4;



	get_page(hpage);

	page = kmap_atomic(hpage, KM_USER0);

	page = kmap_atomic(hpage);



	/* patch dcbz into reserved instruction, so we trap */

	for (i=hpage_offset; i < hpage_offset + (HW_PAGE_SIZE / 4); i++)

		if ((page[i] & 0xff0007ff) == INS_DCBZ)

			page[i] &= 0xfffffff7;



	kunmap_atomic(page, KM_USER0);

	kunmap_atomic(page);

	put_page(hpage);

}

arch/powerpc/mm/dma-noncoherent.c

+2 −3
Original line number Diff line number Diff line
@@ -365,12 +365,11 @@ static inline void __dma_sync_page_highmem(struct page *page, 
	local_irq_save(flags);



	do {

		start = (unsigned long)kmap_atomic(page + seg_nr,

				KM_PPC_SYNC_PAGE) + seg_offset;

		start = (unsigned long)kmap_atomic(page + seg_nr) + seg_offset;



		/* Sync this buffer segment */

		__dma_sync((void *)start, seg_size, direction);

		kunmap_atomic((void *)start, KM_PPC_SYNC_PAGE);

		kunmap_atomic((void *)start);

		seg_nr++;



		/* Calculate next buffer segment size */

arch/powerpc/mm/hugetlbpage.c

+2 −2
Original line number Diff line number Diff line
@@ -910,9 +910,9 @@ void flush_dcache_icache_hugepage(struct page *page) 
		if (!PageHighMem(page)) {

			__flush_dcache_icache(page_address(page+i));

		} else {

			start = kmap_atomic(page+i, KM_PPC_SYNC_ICACHE);

			start = kmap_atomic(page+i);

			__flush_dcache_icache(start);

			kunmap_atomic(start, KM_PPC_SYNC_ICACHE);

			kunmap_atomic(start);

		}

	}

}

arch/powerpc/mm/mem.c

+2 −2
Original line number Diff line number Diff line
@@ -458,9 +458,9 @@ void flush_dcache_icache_page(struct page *page) 
#endif

#ifdef CONFIG_BOOKE

	{

		void *start = kmap_atomic(page, KM_PPC_SYNC_ICACHE);

		void *start = kmap_atomic(page);

		__flush_dcache_icache(start);

		kunmap_atomic(start, KM_PPC_SYNC_ICACHE);

		kunmap_atomic(start);

	}

#elif defined(CONFIG_8xx) || defined(CONFIG_PPC64)

	/* On 8xx there is no need to kmap since highmem is not supported */