linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Cong Wang <amwang@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Cong Wang <amwang@redhat.com>, David Airlie <airlied@linux.ie>,
	Alan Cox <alan@linux.intel.com>,
	Greg Kroah-Hartman <gregkh@suse.de>,
	Dave Airlie <airlied@redhat.com>,
	dri-devel@lists.freedesktop.org
Subject: [PATCH 56/60] gma500: remove the second argument of k[un]map_atomic()
Date: Fri, 10 Feb 2012 13:40:17 +0800	[thread overview]
Message-ID: <1328852421-19678-57-git-send-email-amwang@redhat.com> (raw)
In-Reply-To: <1328852421-19678-1-git-send-email-amwang@redhat.com>

Signed-off-by: Cong Wang <amwang@redhat.com>
---
 drivers/gpu/drm/gma500/mmu.c |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/gma500/mmu.c b/drivers/gpu/drm/gma500/mmu.c
index c904d73..e80ee82 100644
--- a/drivers/gpu/drm/gma500/mmu.c
+++ b/drivers/gpu/drm/gma500/mmu.c
@@ -125,14 +125,14 @@ static void psb_page_clflush(struct psb_mmu_driver *driver, struct page* page)
 	int i;
 	uint8_t *clf;
 
-	clf = kmap_atomic(page, KM_USER0);
+	clf = kmap_atomic(page);
 	mb();
 	for (i = 0; i < clflush_count; ++i) {
 		psb_clflush(clf);
 		clf += clflush_add;
 	}
 	mb();
-	kunmap_atomic(clf, KM_USER0);
+	kunmap_atomic(clf);
 }
 
 static void psb_pages_clflush(struct psb_mmu_driver *driver,
@@ -325,7 +325,7 @@ static struct psb_mmu_pt *psb_mmu_alloc_pt(struct psb_mmu_pd *pd)
 
 	spin_lock(lock);
 
-	v = kmap_atomic(pt->p, KM_USER0);
+	v = kmap_atomic(pt->p);
 	clf = (uint8_t *) v;
 	ptes = (uint32_t *) v;
 	for (i = 0; i < (PAGE_SIZE / sizeof(uint32_t)); ++i)
@@ -341,7 +341,7 @@ static struct psb_mmu_pt *psb_mmu_alloc_pt(struct psb_mmu_pd *pd)
 		mb();
 	}
 
-	kunmap_atomic(v, KM_USER0);
+	kunmap_atomic(v);
 	spin_unlock(lock);
 
 	pt->count = 0;
@@ -376,18 +376,18 @@ struct psb_mmu_pt *psb_mmu_pt_alloc_map_lock(struct psb_mmu_pd *pd,
 			continue;
 		}
 
-		v = kmap_atomic(pd->p, KM_USER0);
+		v = kmap_atomic(pd->p);
 		pd->tables[index] = pt;
 		v[index] = (page_to_pfn(pt->p) << 12) | pd->pd_mask;
 		pt->index = index;
-		kunmap_atomic((void *) v, KM_USER0);
+		kunmap_atomic((void *) v);
 
 		if (pd->hw_context != -1) {
 			psb_mmu_clflush(pd->driver, (void *) &v[index]);
 			atomic_set(&pd->driver->needs_tlbflush, 1);
 		}
 	}
-	pt->v = kmap_atomic(pt->p, KM_USER0);
+	pt->v = kmap_atomic(pt->p);
 	return pt;
 }
 
@@ -404,7 +404,7 @@ static struct psb_mmu_pt *psb_mmu_pt_map_lock(struct psb_mmu_pd *pd,
 		spin_unlock(lock);
 		return NULL;
 	}
-	pt->v = kmap_atomic(pt->p, KM_USER0);
+	pt->v = kmap_atomic(pt->p);
 	return pt;
 }
 
@@ -413,9 +413,9 @@ static void psb_mmu_pt_unmap_unlock(struct psb_mmu_pt *pt)
 	struct psb_mmu_pd *pd = pt->pd;
 	uint32_t *v;
 
-	kunmap_atomic(pt->v, KM_USER0);
+	kunmap_atomic(pt->v);
 	if (pt->count == 0) {
-		v = kmap_atomic(pd->p, KM_USER0);
+		v = kmap_atomic(pd->p);
 		v[pt->index] = pd->invalid_pde;
 		pd->tables[pt->index] = NULL;
 
@@ -424,7 +424,7 @@ static void psb_mmu_pt_unmap_unlock(struct psb_mmu_pt *pt)
 					(void *) &v[pt->index]);
 			atomic_set(&pd->driver->needs_tlbflush, 1);
 		}
-		kunmap_atomic(pt->v, KM_USER0);
+		kunmap_atomic(pt->v);
 		spin_unlock(&pd->driver->lock);
 		psb_mmu_free_pt(pt);
 		return;
@@ -457,7 +457,7 @@ void psb_mmu_mirror_gtt(struct psb_mmu_pd *pd,
 	down_read(&driver->sem);
 	spin_lock(&driver->lock);
 
-	v = kmap_atomic(pd->p, KM_USER0);
+	v = kmap_atomic(pd->p);
 	v += start;
 
 	while (gtt_pages--) {
@@ -467,7 +467,7 @@ void psb_mmu_mirror_gtt(struct psb_mmu_pd *pd,
 
 	/*ttm_tt_cache_flush(&pd->p, num_pages);*/
 	psb_pages_clflush(pd->driver, &pd->p, num_pages);
-	kunmap_atomic(v, KM_USER0);
+	kunmap_atomic(v);
 	spin_unlock(&driver->lock);
 
 	if (pd->hw_context != -1)
@@ -830,9 +830,9 @@ int psb_mmu_virtual_to_pfn(struct psb_mmu_pd *pd, uint32_t virtual,
 		uint32_t *v;
 
 		spin_lock(lock);
-		v = kmap_atomic(pd->p, KM_USER0);
+		v = kmap_atomic(pd->p);
 		tmp = v[psb_mmu_pd_index(virtual)];
-		kunmap_atomic(v, KM_USER0);
+		kunmap_atomic(v);
 		spin_unlock(lock);
 
 		if (tmp != pd->invalid_pde || !(tmp & PSB_PTE_VALID) ||
-- 
1.7.7.6


  parent reply	other threads:[~2012-02-10  5:48 UTC|newest]

Thread overview: 68+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-10  5:39 [Resend PATCH 00/60] highmem: remove the second argument of k[un]map_atomic() Cong Wang
2012-02-10  5:39 ` [PATCH 01/60] highmem: mark k[un]map_atomic() with two arguments as deprecated Cong Wang
2012-02-17 23:59   ` Andrew Morton
2012-02-19 14:57     ` Cong Wang
2012-02-10  5:39 ` [PATCH 02/60] include/linux/highmem.h: remove the second argument of k[un]map_atomic() Cong Wang
2012-02-10  5:39 ` [PATCH 03/60] arm: " Cong Wang
2012-02-10  5:39 ` [PATCH 04/60] mips: " Cong Wang
2012-02-10  5:39 ` [PATCH 05/60] powerpc: " Cong Wang
2012-02-10  5:39 ` [PATCH 06/60] sh: " Cong Wang
2012-02-10  5:39 ` [PATCH 07/60] um: " Cong Wang
2012-02-10  5:39 ` [PATCH 08/60] x86: " Cong Wang
2012-02-10  5:39 ` [PATCH 09/60] crypto: " Cong Wang
2012-02-10  5:39 ` [PATCH 10/60] ata: " Cong Wang
2012-02-10  5:39 ` [PATCH 11/60] block: " Cong Wang
2012-02-10  5:39 ` [PATCH 12/60] crypto: " Cong Wang
2012-02-10  5:39 ` [PATCH 13/60] edac: " Cong Wang
2012-02-10  5:39 ` [PATCH 14/60] drm: " Cong Wang
2012-02-10  7:05   ` Thomas Hellstrom
2012-02-10  5:39 ` [PATCH 15/60] ide: " Cong Wang
2012-02-10  5:39 ` [PATCH 16/60] infiniband: " Cong Wang
2012-02-10  5:39 ` [PATCH 17/60] md: " Cong Wang
2012-02-10  5:39 ` [PATCH 18/60] media: " Cong Wang
2012-02-10  5:39 ` [PATCH 19/60] memstick: " Cong Wang
2012-02-10  5:39 ` [PATCH 20/60] net: " Cong Wang
2012-02-10  5:39 ` [PATCH 22/60] hv: " Cong Wang
2012-02-10  5:39 ` [PATCH 23/60] rtl8192u: " Cong Wang
2012-02-10  5:39 ` [PATCH 24/60] zram: " Cong Wang
2012-02-10  5:39 ` [PATCH 25/60] target: " Cong Wang
2012-02-10 22:18   ` Nicholas A. Bellinger
2012-02-13  7:44     ` Cong Wang
2012-02-10  5:39 ` [PATCH 26/60] vhost: " Cong Wang
2012-02-10  5:39 ` [PATCH 27/60] fs: " Cong Wang
2012-02-10  5:39 ` [PATCH 28/60] btrfs: " Cong Wang
2012-02-10  5:39 ` [PATCH 29/60] ecryptfs: " Cong Wang
2012-02-10 20:16   ` Tyler Hicks
2012-02-13  7:46     ` Cong Wang
2012-02-10  5:39 ` [PATCH 30/60] afs: " Cong Wang
2012-02-10  5:39 ` [PATCH 31/60] exofs: " Cong Wang
2012-02-10  5:39 ` [PATCH 32/60] ext2: " Cong Wang
2012-02-10  5:39 ` [PATCH 33/60] fuse: " Cong Wang
2012-02-10  5:39 ` [PATCH 34/60] gfs2: " Cong Wang
2012-02-10  5:39 ` [PATCH 35/60] jbd: " Cong Wang
2012-02-10  5:39 ` [PATCH 36/60] jbd2: " Cong Wang
2012-02-10  5:39 ` [PATCH 37/60] logfs: " Cong Wang
2012-02-10  5:39 ` [PATCH 38/60] minix: " Cong Wang
2012-02-10  5:40 ` [PATCH 39/60] nfs: " Cong Wang
2012-02-10  5:40 ` [PATCH 40/60] nilfs2: " Cong Wang
2012-02-10  5:40 ` [PATCH 41/60] ntfs: " Cong Wang
2012-02-10  5:40 ` [PATCH 42/60] ocfs2: " Cong Wang
2012-02-10  5:40 ` [PATCH 43/60] reiserfs: " Cong Wang
2012-02-10  5:40 ` [PATCH 44/60] squashfs: " Cong Wang
2012-02-10  5:40 ` [PATCH 45/60] ubifs: " Cong Wang
2012-02-10  5:40 ` [PATCH 46/60] udf: " Cong Wang
2012-02-10  5:40 ` [PATCH 47/60] kdb: " Cong Wang
2012-02-10  5:40 ` [PATCH 48/60] power: " Cong Wang
2012-02-10  5:40 ` [PATCH 49/60] lib: " Cong Wang
2012-02-10  5:40 ` [PATCH 50/60] mm: " Cong Wang
2012-02-10  5:40 ` [PATCH 51/60] net: " Cong Wang
2012-02-10  5:40 ` [PATCH 52/60] rds: " Cong Wang
2012-02-10  5:40 ` [PATCH 53/60] sunrpc: " Cong Wang
2012-02-10  5:40 ` [PATCH 54/60] tomoyo: " Cong Wang
2012-02-10  5:40 ` [PATCH 55/60] dm: " Cong Wang
2012-02-10  5:40 ` Cong Wang [this message]
2012-02-10  5:40 ` [PATCH 57/60] zcache: " Cong Wang
2012-02-10  5:40 ` [PATCH 58/60] drbd: " Cong Wang
     [not found]   ` <CA+xKNSgdt7mc2NYTbprFspE54R_4T4PTzyGKyKESqBRyaNCPJg@mail.gmail.com>
2012-02-13  7:43     ` [Drbd-dev] " Cong Wang
2012-02-10  5:40 ` [PATCH 60/60] feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal Cong Wang
     [not found] ` <1328852421-19678-60-git-send-email-amwang@redhat.com>
2012-02-10 13:05   ` [PATCH 59/60] highmem: kill all __kmap_atomic() [swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename] Chris Metcalf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1328852421-19678-57-git-send-email-amwang@redhat.com \
    --to=amwang@redhat.com \
    --cc=airlied@linux.ie \
    --cc=airlied@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=alan@linux.intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=gregkh@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).