From: Cong Wang <amwang@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: akpm@linux-foundation.org, Cong Wang <amwang@redhat.com>,
Herbert Xu <herbert@gondor.hengli.com.au>,
"David S. Miller" <davem@davemloft.net>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Avi Kivity <avi@redhat.com>,
Marcelo Tosatti <mtosatti@redhat.com>,
Olaf Hering <olaf@aepfle.de>,
linux-crypto@vger.kernel.org, kvm@vger.kernel.org
Subject: [PATCH 08/62] x86: remove the second argument of k[un]map_atomic()
Date: Sun, 27 Nov 2011 13:26:48 +0800 [thread overview]
Message-ID: <1322371662-26166-9-git-send-email-amwang@redhat.com> (raw)
In-Reply-To: <1322371662-26166-1-git-send-email-amwang@redhat.com>
Signed-off-by: Cong Wang <amwang@redhat.com>
---
arch/x86/crypto/aesni-intel_glue.c | 24 ++++++++++++------------
arch/x86/kernel/crash_dump_32.c | 6 +++---
arch/x86/kvm/lapic.c | 8 ++++----
arch/x86/kvm/paging_tmpl.h | 4 ++--
arch/x86/kvm/x86.c | 8 ++++----
arch/x86/lib/usercopy_32.c | 4 ++--
6 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
index 545d0ce..152232d 100644
--- a/arch/x86/crypto/aesni-intel_glue.c
+++ b/arch/x86/crypto/aesni-intel_glue.c
@@ -1107,12 +1107,12 @@ static int __driver_rfc4106_encrypt(struct aead_request *req)
one_entry_in_sg = 1;
scatterwalk_start(&src_sg_walk, req->src);
scatterwalk_start(&assoc_sg_walk, req->assoc);
- src = scatterwalk_map(&src_sg_walk, 0);
- assoc = scatterwalk_map(&assoc_sg_walk, 0);
+ src = scatterwalk_map(&src_sg_walk);
+ assoc = scatterwalk_map(&assoc_sg_walk);
dst = src;
if (unlikely(req->src != req->dst)) {
scatterwalk_start(&dst_sg_walk, req->dst);
- dst = scatterwalk_map(&dst_sg_walk, 0);
+ dst = scatterwalk_map(&dst_sg_walk);
}
} else {
@@ -1136,11 +1136,11 @@ static int __driver_rfc4106_encrypt(struct aead_request *req)
* back to the packet. */
if (one_entry_in_sg) {
if (unlikely(req->src != req->dst)) {
- scatterwalk_unmap(dst, 0);
+ scatterwalk_unmap(dst);
scatterwalk_done(&dst_sg_walk, 0, 0);
}
- scatterwalk_unmap(src, 0);
- scatterwalk_unmap(assoc, 0);
+ scatterwalk_unmap(src);
+ scatterwalk_unmap(assoc);
scatterwalk_done(&src_sg_walk, 0, 0);
scatterwalk_done(&assoc_sg_walk, 0, 0);
} else {
@@ -1189,12 +1189,12 @@ static int __driver_rfc4106_decrypt(struct aead_request *req)
one_entry_in_sg = 1;
scatterwalk_start(&src_sg_walk, req->src);
scatterwalk_start(&assoc_sg_walk, req->assoc);
- src = scatterwalk_map(&src_sg_walk, 0);
- assoc = scatterwalk_map(&assoc_sg_walk, 0);
+ src = scatterwalk_map(&src_sg_walk);
+ assoc = scatterwalk_map(&assoc_sg_walk);
dst = src;
if (unlikely(req->src != req->dst)) {
scatterwalk_start(&dst_sg_walk, req->dst);
- dst = scatterwalk_map(&dst_sg_walk, 0);
+ dst = scatterwalk_map(&dst_sg_walk);
}
} else {
@@ -1219,11 +1219,11 @@ static int __driver_rfc4106_decrypt(struct aead_request *req)
if (one_entry_in_sg) {
if (unlikely(req->src != req->dst)) {
- scatterwalk_unmap(dst, 0);
+ scatterwalk_unmap(dst);
scatterwalk_done(&dst_sg_walk, 0, 0);
}
- scatterwalk_unmap(src, 0);
- scatterwalk_unmap(assoc, 0);
+ scatterwalk_unmap(src);
+ scatterwalk_unmap(assoc);
scatterwalk_done(&src_sg_walk, 0, 0);
scatterwalk_done(&assoc_sg_walk, 0, 0);
} else {
diff --git a/arch/x86/kernel/crash_dump_32.c b/arch/x86/kernel/crash_dump_32.c
index 642f75a..11891ca 100644
--- a/arch/x86/kernel/crash_dump_32.c
+++ b/arch/x86/kernel/crash_dump_32.c
@@ -62,16 +62,16 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
if (!userbuf) {
memcpy(buf, (vaddr + offset), csize);
- kunmap_atomic(vaddr, KM_PTE0);
+ kunmap_atomic(vaddr);
} else {
if (!kdump_buf_page) {
printk(KERN_WARNING "Kdump: Kdump buffer page not"
" allocated\n");
- kunmap_atomic(vaddr, KM_PTE0);
+ kunmap_atomic(vaddr);
return -EFAULT;
}
copy_page(kdump_buf_page, vaddr);
- kunmap_atomic(vaddr, KM_PTE0);
+ kunmap_atomic(vaddr);
if (copy_to_user(buf, (kdump_buf_page + offset), csize))
return -EFAULT;
}
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 54abb40..e462e30 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -1282,9 +1282,9 @@ void kvm_lapic_sync_from_vapic(struct kvm_vcpu *vcpu)
if (!irqchip_in_kernel(vcpu->kvm) || !vcpu->arch.apic->vapic_addr)
return;
- vapic = kmap_atomic(vcpu->arch.apic->vapic_page, KM_USER0);
+ vapic = kmap_atomic(vcpu->arch.apic->vapic_page);
data = *(u32 *)(vapic + offset_in_page(vcpu->arch.apic->vapic_addr));
- kunmap_atomic(vapic, KM_USER0);
+ kunmap_atomic(vapic);
apic_set_tpr(vcpu->arch.apic, data & 0xff);
}
@@ -1309,9 +1309,9 @@ void kvm_lapic_sync_to_vapic(struct kvm_vcpu *vcpu)
max_isr = 0;
data = (tpr & 0xff) | ((max_isr & 0xf0) << 8) | (max_irr << 24);
- vapic = kmap_atomic(vcpu->arch.apic->vapic_page, KM_USER0);
+ vapic = kmap_atomic(vcpu->arch.apic->vapic_page);
*(u32 *)(vapic + offset_in_page(vcpu->arch.apic->vapic_addr)) = data;
- kunmap_atomic(vapic, KM_USER0);
+ kunmap_atomic(vapic);
}
void kvm_lapic_set_vapic_addr(struct kvm_vcpu *vcpu, gpa_t vapic_addr)
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index 9299410..b7c5f7c 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -92,9 +92,9 @@ static int FNAME(cmpxchg_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,
if (unlikely(npages != 1))
return -EFAULT;
- table = kmap_atomic(page, KM_USER0);
+ table = kmap_atomic(page);
ret = CMPXCHG(&table[index], orig_pte, new_pte);
- kunmap_atomic(table, KM_USER0);
+ kunmap_atomic(table);
kvm_release_page_dirty(page);
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index c38efd7..dfc7c23 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1200,12 +1200,12 @@ static int kvm_guest_time_update(struct kvm_vcpu *v)
*/
vcpu->hv_clock.version += 2;
- shared_kaddr = kmap_atomic(vcpu->time_page, KM_USER0);
+ shared_kaddr = kmap_atomic(vcpu->time_page);
memcpy(shared_kaddr + vcpu->time_offset, &vcpu->hv_clock,
sizeof(vcpu->hv_clock));
- kunmap_atomic(shared_kaddr, KM_USER0);
+ kunmap_atomic(shared_kaddr);
mark_page_dirty(v->kvm, vcpu->time >> PAGE_SHIFT);
return 0;
@@ -4301,7 +4301,7 @@ static int emulator_cmpxchg_emulated(struct x86_emulate_ctxt *ctxt,
goto emul_write;
}
- kaddr = kmap_atomic(page, KM_USER0);
+ kaddr = kmap_atomic(page);
kaddr += offset_in_page(gpa);
switch (bytes) {
case 1:
@@ -4319,7 +4319,7 @@ static int emulator_cmpxchg_emulated(struct x86_emulate_ctxt *ctxt,
default:
BUG();
}
- kunmap_atomic(kaddr, KM_USER0);
+ kunmap_atomic(kaddr);
kvm_release_page_dirty(page);
if (!exchanged)
diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
index e218d5d..d9b094c 100644
--- a/arch/x86/lib/usercopy_32.c
+++ b/arch/x86/lib/usercopy_32.c
@@ -760,9 +760,9 @@ survive:
break;
}
- maddr = kmap_atomic(pg, KM_USER0);
+ maddr = kmap_atomic(pg);
memcpy(maddr + offset, from, len);
- kunmap_atomic(maddr, KM_USER0);
+ kunmap_atomic(maddr);
set_page_dirty_lock(pg);
put_page(pg);
up_read(¤t->mm->mmap_sem);
--
1.7.4.4
next prev parent reply other threads:[~2011-11-27 5:30 UTC|newest]
Thread overview: 121+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-27 5:26 [V2 PATCH 00/62] highmem: remove the second argument of kmap_atomic/kunmap_atomic Cong Wang
2011-11-27 5:26 ` [PATCH 01/62] highmem: mark k[un]map_atomic() with two arguments as deprecated Cong Wang
2011-11-27 12:34 ` Cesar Eduardo Barros
2011-11-28 5:07 ` Cong Wang
2011-11-28 7:46 ` [UPDATED PATCH " Cong Wang
2011-11-27 5:26 ` [PATCH 02/62] include/linux/highmem.h: remove the second argument of k[un]map_atomic() Cong Wang
2011-11-27 5:26 ` [PATCH 03/62] arm: " Cong Wang
2011-12-10 21:46 ` Russell King - ARM Linux
2011-11-27 5:26 ` [PATCH 04/62] mips: " Cong Wang
2011-12-09 16:06 ` Ralf Baechle
2011-12-12 2:52 ` Cong Wang
2011-11-27 5:26 ` [PATCH 05/62] powerpc: " Cong Wang
2011-11-27 5:26 ` [PATCH 06/62] sh: " Cong Wang
2011-11-27 5:26 ` [PATCH 07/62] um: " Cong Wang
2011-11-27 5:26 ` Cong Wang [this message]
2011-11-28 12:35 ` [PATCH 08/62] x86: " Avi Kivity
2011-11-28 12:47 ` Herbert Xu
2011-11-27 5:26 ` [PATCH 09/62] crypto: " Cong Wang
2011-11-27 5:26 ` [PATCH 10/62] ata: " Cong Wang
2011-11-27 18:40 ` Jeff Garzik
2011-11-28 10:01 ` Sergei Shtylyov
2011-11-28 11:42 ` Cong Wang
2011-11-28 11:49 ` Cong Wang
2011-11-28 19:00 ` James Bottomley
2011-11-29 3:25 ` Cong Wang
2011-11-27 5:26 ` [PATCH 11/62] block: " Cong Wang
2011-11-27 5:26 ` [PATCH 12/62] crypto: " Cong Wang
2011-11-27 5:26 ` [PATCH 13/62] edac: " Cong Wang
2011-11-27 5:26 ` [PATCH 14/62] drm: " Cong Wang
2011-11-27 5:26 ` [PATCH 15/62] ide: " Cong Wang
2011-11-27 6:12 ` David Miller
2011-11-27 5:26 ` [PATCH 16/62] infiniband: " Cong Wang
2011-11-28 7:38 ` Roland Dreier
2011-11-28 7:45 ` Cong Wang
2011-11-27 5:26 ` [PATCH 17/62] md: " Cong Wang
2011-11-27 6:00 ` NeilBrown
2011-11-27 10:27 ` [dm-devel] " Milan Broz
2011-11-28 5:10 ` Cong Wang
2011-11-28 7:47 ` [UPDATED PATCH " Cong Wang
2011-11-27 5:26 ` [PATCH 18/62] media: " Cong Wang
2011-11-27 23:10 ` Andy Walls
2011-11-27 5:26 ` [PATCH 19/62] memstick: " Cong Wang
2011-11-27 5:27 ` [PATCH 20/62] mmc: " Cong Wang
2011-11-27 21:02 ` Guennadi Liakhovetski
2011-11-30 23:51 ` David Brown
2011-12-01 18:47 ` Chris Ball
2011-12-02 2:10 ` Cong Wang
2011-11-27 5:27 ` [PATCH 21/62] net: " Cong Wang
2011-11-27 6:12 ` David Miller
2011-11-27 8:07 ` Eric Dumazet
2011-11-28 18:06 ` Alexander Duyck
2011-11-28 18:26 ` Eric Dumazet
2011-11-28 7:39 ` Cong Wang
2011-11-28 7:48 ` [UPDATED PATCH " Cong Wang
2011-11-27 5:27 ` [PATCH 23/62] hv: " Cong Wang
2011-11-27 9:34 ` Greg KH
2011-11-27 5:27 ` [PATCH 24/62] pohmelfs: " Cong Wang
2011-11-27 9:34 ` Greg KH
2011-11-28 0:58 ` Evgeniy Polyakov
2011-11-27 5:27 ` [PATCH 25/62] rtl8192u: " Cong Wang
2011-11-27 9:34 ` Greg KH
2011-11-27 5:27 ` [PATCH 26/62] zram: " Cong Wang
2011-11-27 9:34 ` Greg KH
2011-11-27 5:27 ` [PATCH 27/62] target: " Cong Wang
2011-11-27 5:27 ` [PATCH 28/62] vhost: " Cong Wang
2011-11-27 5:27 ` [PATCH 29/62] fs: " Cong Wang
2011-11-28 2:36 ` Benjamin LaHaise
2011-11-27 5:27 ` [PATCH 30/62] btrfs: " Cong Wang
2011-11-27 5:27 ` [PATCH 31/62] ecryptfs: " Cong Wang
2011-11-27 5:27 ` [PATCH 32/62] afs: " Cong Wang
2011-11-27 5:27 ` [PATCH 33/62] exofs: " Cong Wang
2011-11-28 17:35 ` Boaz Harrosh
2011-11-27 5:27 ` [PATCH 34/62] ext2: " Cong Wang
2011-11-28 14:15 ` Jan Kara
2011-11-27 5:27 ` [PATCH 35/62] fuse: " Cong Wang
2011-11-27 5:27 ` [PATCH 36/62] gfs2: " Cong Wang
2011-11-27 5:27 ` [PATCH 37/62] jbd: " Cong Wang
2011-11-28 14:15 ` Jan Kara
2011-11-27 5:27 ` [PATCH 38/62] jbd2: " Cong Wang
2011-11-27 5:27 ` [PATCH 39/62] logfs: " Cong Wang
2011-11-27 5:27 ` [PATCH 40/62] minix: " Cong Wang
2011-11-27 5:27 ` [PATCH 41/62] nfs: " Cong Wang
2011-11-27 5:27 ` [PATCH 42/62] nilfs2: " Cong Wang
2011-11-28 16:14 ` Ryusuke Konishi
2011-11-27 5:27 ` [PATCH 43/62] ntfs: " Cong Wang
2011-11-27 5:27 ` [PATCH 44/62] ocfs2: " Cong Wang
2011-12-01 20:18 ` Joel Becker
2011-12-02 2:04 ` Cong Wang
2011-12-02 2:29 ` Andrew Morton
2011-12-02 2:38 ` Cong Wang
2011-11-27 5:27 ` [PATCH 45/62] reiserfs: " Cong Wang
2011-11-27 5:27 ` [PATCH 46/62] squashfs: " Cong Wang
2011-11-27 5:27 ` [PATCH 47/62] ubifs: " Cong Wang
2011-11-27 5:27 ` [PATCH 48/62] udf: " Cong Wang
2011-11-28 14:16 ` Jan Kara
2011-11-27 5:27 ` [PATCH 49/62] kdb: " Cong Wang
2011-11-27 5:27 ` [PATCH 50/62] power: " Cong Wang
2011-11-27 11:38 ` Rafael J. Wysocki
2011-11-27 5:27 ` [PATCH 51/62] lib: " Cong Wang
2011-11-27 5:27 ` [PATCH 52/62] mm: " Cong Wang
2011-11-27 5:27 ` [PATCH 53/62] net: " Cong Wang
2011-11-27 6:12 ` David Miller
2011-11-27 5:27 ` [PATCH 54/62] rds: " Cong Wang
2011-11-27 6:13 ` David Miller
2011-11-27 5:27 ` [PATCH 55/62] sunrpc: " Cong Wang
2011-11-27 5:27 ` [PATCH 56/62] tomoyo: " Cong Wang
2011-11-27 5:27 ` [PATCH 57/62] md: " Cong Wang
2011-11-28 7:50 ` [UPDATED PATCH 57/62] dm: " Cong Wang
2011-11-27 5:27 ` [PATCH 58/62] gma500: " Cong Wang
2011-11-28 11:33 ` Alan Cox
2011-11-27 5:27 ` [PATCH 59/62] zcache: " Cong Wang
2011-11-27 9:34 ` Greg KH
2011-11-27 5:27 ` [PATCH 60/62] drbd: " Cong Wang
2011-11-27 5:27 ` [PATCH 61/62] highmem: kill all __kmap_atomic() Cong Wang
2011-12-09 16:07 ` Ralf Baechle
2011-11-27 5:27 ` [PATCH 62/62] feature-removal-schedule.txt: add the deprecated form of kmap_atomic() Cong Wang
2011-11-27 22:21 ` [V2 PATCH 00/62] highmem: remove the second argument of kmap_atomic/kunmap_atomic Benjamin Herrenschmidt
2011-11-28 4:34 ` Benjamin Herrenschmidt
2011-11-28 5:34 ` Cong Wang
2011-11-28 7:42 ` Cong Wang
2011-11-29 3:36 ` Cong Wang
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=1322371662-26166-9-git-send-email-amwang@redhat.com \
--to=amwang@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=avi@redhat.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.hengli.com.au \
--cc=hpa@zytor.com \
--cc=kvm@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=mtosatti@redhat.com \
--cc=olaf@aepfle.de \
--cc=tglx@linutronix.de \
--cc=x86@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
all inboxes | Powered by JetHome®