aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kvm
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-02-29 03:42:07 -0500
committerIngo Molnar <mingo@kernel.org>2016-02-29 03:42:07 -0500
commit6aa447bcbb444cd1b738613a20627f288d631665 (patch)
tree62030bb14be0006248181305ac1fe377a99e5b65 /arch/arm/kvm
parentabedf8e2419fb873d919dd74de2e84b510259339 (diff)
parent48be3a67da7413d62e5efbcf2c73a9dddf61fb96 (diff)
Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/kvm')
-rw-r--r--arch/arm/kvm/mmio.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kvm/mmio.c b/arch/arm/kvm/mmio.c
index 7f33b2056ae6..0f6600f05137 100644
--- a/arch/arm/kvm/mmio.c
+++ b/arch/arm/kvm/mmio.c
@@ -206,7 +206,8 @@ int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run,
206 run->mmio.is_write = is_write; 206 run->mmio.is_write = is_write;
207 run->mmio.phys_addr = fault_ipa; 207 run->mmio.phys_addr = fault_ipa;
208 run->mmio.len = len; 208 run->mmio.len = len;
209 memcpy(run->mmio.data, data_buf, len); 209 if (is_write)
210 memcpy(run->mmio.data, data_buf, len);
210 211
211 if (!ret) { 212 if (!ret) {
212 /* We handled the access successfully in the kernel. */ 213 /* We handled the access successfully in the kernel. */