Revert "staging: kpc2000: Convert put_page() to put_user_page*()" (9a675a13) · Commits · 戴 / test

This reverts commit . Bharath writes: Could you drop this patch from the staging-next tree? This is because John is making some changes to the put_user_page*() functions. He has submitted a patch recently removing put_user_page_dirty() function which is being used in this patch. This might break the kernel build if John's patch gets merged in. I ll submit a patch once the put_user_page*() apis are fixed. Reported-by:

Bharath Vedartham <linux.bhar@gmail.com> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/staging/kpc2000/kpc_dma/fileops.c

+11 −6

Original line number	Diff line number	Diff line
		@@ -190,7 +190,9 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
		sg_free_table(&acd->sgt);
		err_dma_map_sg:
		err_alloc_sg_table:
		put_user_pages(acd->user_pages, acd->page_count);
		for (i = 0 ; i < acd->page_count ; i++) {
		put_page(acd->user_pages[i]);
		}
		err_get_user_pages:
		kfree(acd->user_pages);
		err_alloc_userpages:
		@@ -209,13 +211,16 @@ void transfer_complete_cb(struct aio_cb_data *acd, size_t xfr_count, u32 flags)
		BUG_ON(acd->ldev == NULL);
		BUG_ON(acd->ldev->pldev == NULL);

		for (i = 0 ; i < acd->page_count ; i++) {
		if (!PageReserved(acd->user_pages[i])) {
		set_page_dirty(acd->user_pages[i]);
		}
		}

		dma_unmap_sg(&acd->ldev->pldev->dev, acd->sgt.sgl, acd->sgt.nents, acd->ldev->dir);

		for (i = 0 ; i < acd->page_count ; i++) {
		if (!PageReserved(acd->user_pages[i]))
		put_user_pages_dirty(&acd->user_pages[i], 1);
		else
		put_user_page(acd->user_pages[i]);
		put_page(acd->user_pages[i]);
		}

		sg_free_table(&acd->sgt);

Admin message