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

Acked-by: Avi Kivity <avi@redhat.com> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Cong Wang <amwang@redhat.com>

x86: remove the second argument of k[un]map_atomic()
Acked-by: Avi Kivity <avi@redhat.com> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Cong Wang <amwang@redhat.com>
Cong Wang · Cong Wang
1 parent 91f2359396
Showing 6 changed files with 27 additions and 27 deletions Side-by-side Diff
arch/x86/crypto/aesni-intel_glue.c
arch/x86/kernel/crash_dump_32.c
arch/x86/kvm/lapic.c
arch/x86/kvm/paging_tmpl.h
arch/x86/kvm/x86.c
arch/x86/lib/usercopy_32.c
@@ -1107,12 +1107,12 @@
 		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 @@
 	 * 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 @@
 		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 @@
  
 	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 {
@@ -62,16 +62,16 @@
  
 	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;
 	}
@@ -1283,9 +1283,9 @@
 	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);
 }
  
@@ -1310,9 +1310,9 @@
 		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)
@@ -92,9 +92,9 @@
 	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);
  
@@ -1162,12 +1162,12 @@
 	 */
 	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;
@@ -3848,7 +3848,7 @@
 		goto emul_write;
 	}
  
-	kaddr = kmap_atomic(page, KM_USER0);
+	kaddr = kmap_atomic(page);
 	kaddr += offset_in_page(gpa);
 	switch (bytes) {
 	case 1:
@@ -3866,7 +3866,7 @@
 	default:
 		BUG();
 	}
-	kunmap_atomic(kaddr, KM_USER0);
+	kunmap_atomic(kaddr);
 	kvm_release_page_dirty(page);
  
 	if (!exchanged)
@@ -760,9 +760,9 @@
 				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(&current->mm->mmap_sem);
...	...	@@ -1107,12 +1107,12 @@
1107	1107	one_entry_in_sg = 1;
1108	1108	scatterwalk_start(&src_sg_walk, req->src);
1109	1109	scatterwalk_start(&assoc_sg_walk, req->assoc);
1110		- src = scatterwalk_map(&src_sg_walk, 0);
1111		- assoc = scatterwalk_map(&assoc_sg_walk, 0);
	1110	+ src = scatterwalk_map(&src_sg_walk);
	1111	+ assoc = scatterwalk_map(&assoc_sg_walk);
1112	1112	dst = src;
1113	1113	if (unlikely(req->src != req->dst)) {
1114	1114	scatterwalk_start(&dst_sg_walk, req->dst);
1115		- dst = scatterwalk_map(&dst_sg_walk, 0);
	1115	+ dst = scatterwalk_map(&dst_sg_walk);
1116	1116	}
1117	1117
1118	1118	} else {
1119	1119
...	...	@@ -1136,11 +1136,11 @@
1136	1136	* back to the packet. */
1137	1137	if (one_entry_in_sg) {
1138	1138	if (unlikely(req->src != req->dst)) {
1139		- scatterwalk_unmap(dst, 0);
	1139	+ scatterwalk_unmap(dst);
1140	1140	scatterwalk_done(&dst_sg_walk, 0, 0);
1141	1141	}
1142		- scatterwalk_unmap(src, 0);
1143		- scatterwalk_unmap(assoc, 0);
	1142	+ scatterwalk_unmap(src);
	1143	+ scatterwalk_unmap(assoc);
1144	1144	scatterwalk_done(&src_sg_walk, 0, 0);
1145	1145	scatterwalk_done(&assoc_sg_walk, 0, 0);
1146	1146	} else {
1147	1147
...	...	@@ -1189,12 +1189,12 @@
1189	1189	one_entry_in_sg = 1;
1190	1190	scatterwalk_start(&src_sg_walk, req->src);
1191	1191	scatterwalk_start(&assoc_sg_walk, req->assoc);
1192		- src = scatterwalk_map(&src_sg_walk, 0);
1193		- assoc = scatterwalk_map(&assoc_sg_walk, 0);
	1192	+ src = scatterwalk_map(&src_sg_walk);
	1193	+ assoc = scatterwalk_map(&assoc_sg_walk);
1194	1194	dst = src;
1195	1195	if (unlikely(req->src != req->dst)) {
1196	1196	scatterwalk_start(&dst_sg_walk, req->dst);
1197		- dst = scatterwalk_map(&dst_sg_walk, 0);
	1197	+ dst = scatterwalk_map(&dst_sg_walk);
1198	1198	}
1199	1199
1200	1200	} else {
1201	1201
...	...	@@ -1219,11 +1219,11 @@
1219	1219
1220	1220	if (one_entry_in_sg) {
1221	1221	if (unlikely(req->src != req->dst)) {
1222		- scatterwalk_unmap(dst, 0);
	1222	+ scatterwalk_unmap(dst);
1223	1223	scatterwalk_done(&dst_sg_walk, 0, 0);
1224	1224	}
1225		- scatterwalk_unmap(src, 0);
1226		- scatterwalk_unmap(assoc, 0);
	1225	+ scatterwalk_unmap(src);
	1226	+ scatterwalk_unmap(assoc);
1227	1227	scatterwalk_done(&src_sg_walk, 0, 0);
1228	1228	scatterwalk_done(&assoc_sg_walk, 0, 0);
1229	1229	} else {
...	...	@@ -62,16 +62,16 @@
62	62
63	63	if (!userbuf) {
64	64	memcpy(buf, (vaddr + offset), csize);
65		- kunmap_atomic(vaddr, KM_PTE0);
	65	+ kunmap_atomic(vaddr);
66	66	} else {
67	67	if (!kdump_buf_page) {
68	68	printk(KERN_WARNING "Kdump: Kdump buffer page not"
69	69	" allocated\n");
70		- kunmap_atomic(vaddr, KM_PTE0);
	70	+ kunmap_atomic(vaddr);
71	71	return -EFAULT;
72	72	}
73	73	copy_page(kdump_buf_page, vaddr);
74		- kunmap_atomic(vaddr, KM_PTE0);
	74	+ kunmap_atomic(vaddr);
75	75	if (copy_to_user(buf, (kdump_buf_page + offset), csize))
76	76	return -EFAULT;
77	77	}
...	...	@@ -1283,9 +1283,9 @@
1283	1283	if (!irqchip_in_kernel(vcpu->kvm) \|\| !vcpu->arch.apic->vapic_addr)
1284	1284	return;
1285	1285
1286		- vapic = kmap_atomic(vcpu->arch.apic->vapic_page, KM_USER0);
	1286	+ vapic = kmap_atomic(vcpu->arch.apic->vapic_page);
1287	1287	data = (u32 )(vapic + offset_in_page(vcpu->arch.apic->vapic_addr));
1288		- kunmap_atomic(vapic, KM_USER0);
	1288	+ kunmap_atomic(vapic);
1289	1289
1290	1290	apic_set_tpr(vcpu->arch.apic, data & 0xff);
1291	1291	}
1292	1292
...	...	@@ -1310,9 +1310,9 @@
1310	1310	max_isr = 0;
1311	1311	data = (tpr & 0xff) \| ((max_isr & 0xf0) << 8) \| (max_irr << 24);
1312	1312
1313		- vapic = kmap_atomic(vcpu->arch.apic->vapic_page, KM_USER0);
	1313	+ vapic = kmap_atomic(vcpu->arch.apic->vapic_page);
1314	1314	(u32 )(vapic + offset_in_page(vcpu->arch.apic->vapic_addr)) = data;
1315		- kunmap_atomic(vapic, KM_USER0);
	1315	+ kunmap_atomic(vapic);
1316	1316	}
1317	1317
1318	1318	void kvm_lapic_set_vapic_addr(struct kvm_vcpu *vcpu, gpa_t vapic_addr)
...	...	@@ -92,9 +92,9 @@
92	92	if (unlikely(npages != 1))
93	93	return -EFAULT;
94	94
95		- table = kmap_atomic(page, KM_USER0);
	95	+ table = kmap_atomic(page);
96	96	ret = CMPXCHG(&table[index], orig_pte, new_pte);
97		- kunmap_atomic(table, KM_USER0);
	97	+ kunmap_atomic(table);
98	98
99	99	kvm_release_page_dirty(page);
100	100
...	...	@@ -1162,12 +1162,12 @@
1162	1162	*/
1163	1163	vcpu->hv_clock.version += 2;
1164	1164
1165		- shared_kaddr = kmap_atomic(vcpu->time_page, KM_USER0);
	1165	+ shared_kaddr = kmap_atomic(vcpu->time_page);
1166	1166
1167	1167	memcpy(shared_kaddr + vcpu->time_offset, &vcpu->hv_clock,
1168	1168	sizeof(vcpu->hv_clock));
1169	1169
1170		- kunmap_atomic(shared_kaddr, KM_USER0);
	1170	+ kunmap_atomic(shared_kaddr);
1171	1171
1172	1172	mark_page_dirty(v->kvm, vcpu->time >> PAGE_SHIFT);
1173	1173	return 0;
...	...	@@ -3848,7 +3848,7 @@
3848	3848	goto emul_write;
3849	3849	}
3850	3850
3851		- kaddr = kmap_atomic(page, KM_USER0);
	3851	+ kaddr = kmap_atomic(page);
3852	3852	kaddr += offset_in_page(gpa);
3853	3853	switch (bytes) {
3854	3854	case 1:
...	...	@@ -3866,7 +3866,7 @@
3866	3866	default:
3867	3867	BUG();
3868	3868	}
3869		- kunmap_atomic(kaddr, KM_USER0);
	3869	+ kunmap_atomic(kaddr);
3870	3870	kvm_release_page_dirty(page);
3871	3871
3872	3872	if (!exchanged)
...	...	@@ -760,9 +760,9 @@
760	760	break;
761	761	}
762	762
763		- maddr = kmap_atomic(pg, KM_USER0);
	763	+ maddr = kmap_atomic(pg);
764	764	memcpy(maddr + offset, from, len);
765		- kunmap_atomic(maddr, KM_USER0);
	765	+ kunmap_atomic(maddr);
766	766	set_page_dirty_lock(pg);
767	767	put_page(pg);
768	768	up_read(&current->mm->mmap_sem);