Re: [PATCH 08/62] x86: remove the second argument of k[un]map_atomic()

[Herbert Xu]

On Sun, Nov 27, 2011 at 01:26:48PM +0800, Cong Wang wrote:
> 
> Signed-off-by: Cong Wang 

Acked-by: Herbert Xu 

Thanks,
-- 
Email: Herbert Xu 
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 08/62] x86: remove the second argument of k[un]map_atomic()

[Avi Kivity]

On 11/27/2011 07:26 AM, Cong Wang wrote:
> Signed-off-by: Cong Wang 
> ---

>  arch/x86/kvm/lapic.c   |8 
>  arch/x86/kvm/paging_tmpl.h |4 ++--
>  arch/x86/kvm/x86.c |8 
>

The kvm parts are:

Acked-by: Avi Kivity 

-- 
error compiling committee.c: too many arguments to function

--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 08/62] x86: remove the second argument of k[un]map_atomic()

[Cong Wang]

Signed-off-by: Cong Wang 
---
 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 + offse