openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

KVM/ARM Updates for Linux 3.12 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJSISFLAAoJEEtpOizt6ddyZDAH/jhIQ6svBl0xwZB77feSlzTQ
 752CnT+NVLLaDkdcf2vQ+Rw+QDravB1q5erLR3wGmWhvKFK6Xpvf7JNTz++7kzbu
 HxenPmOrZhfjtcJ2+1vmvt6fZTe7NvjYc5wjOfX5gHKMwuk4WhF3gvLgUC88b8nT
 qprxkVBsHQPWmfhrrUY4E/jgRYQzXxy4jGQNOFC59iur1KM7whd9y2TFl1NCf1SU
 rJfnSg7PcowscCz5OauYK6Da4RfFmKWSsBOGDv8COwRNej6zXH68ImKIklhr7OZ+
 a1snH0Bs7jQ0cQF/Tdvtih1hTJ3zlKHilFt2enrhK+qBeAbtCacw+lg9tCa0HwI=
 =iJqf
 -----END PGP SIGNATURE-----

Merge tag 'kvm-arm-for-3.12' of git://git.linaro.org/people/cdall/linux-kvm-arm into queue

KVM/ARM Updates for Linux 3.12

* tag 'kvm-arm-for-3.12' of git://git.linaro.org/people/cdall/linux-kvm-arm:
  ARM: KVM: Add newlines to panic strings
  ARM: KVM: Work around older compiler bug
  ARM: KVM: Simplify tracepoint text
  ARM: KVM: Fix kvm_set_pte assignment
This commit is contained in:
Gleb Natapov 2013-09-01 10:48:18 +03:00
parent 9b2d2e0df8 1fe40f6d39
commit 6b9e4fa074
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/kvm_mmu.h
View File

@ -64,7 +64,7 @@ void kvm_clear_hyp_idmap(void);
static inline void kvm_set_pte(pte_t *pte, pte_t new_pte)
{
pte_val(*pte) = new_pte;
*pte = new_pte;
/*
* flush_pmd_entry just takes a void pointer and cleans the necessary
* cache entries, so we can reuse the function for ptes.

8
arch/arm/kvm/interrupts.S
View File

@ -492,10 +492,10 @@ __kvm_hyp_code_end:
.section ".rodata"
und_die_str:
.ascii "unexpected undefined exception in Hyp mode at: %#08x"
.ascii "unexpected undefined exception in Hyp mode at: %#08x\n"
pabt_die_str:
.ascii "unexpected prefetch abort in Hyp mode at: %#08x"
.ascii "unexpected prefetch abort in Hyp mode at: %#08x\n"
dabt_die_str:
.ascii "unexpected data abort in Hyp mode at: %#08x"
.ascii "unexpected data abort in Hyp mode at: %#08x\n"
svc_die_str:
.ascii "unexpected HVC/SVC trap in Hyp mode at: %#08x"
.ascii "unexpected HVC/SVC trap in Hyp mode at: %#08x\n"

2
arch/arm/kvm/reset.c
View File

@ -40,7 +40,7 @@ static struct kvm_regs a15_regs_reset = {
};
static const struct kvm_irq_level a15_vtimer_irq = {
.irq = 27,
{ .irq = 27 },
.level = 1,
};

7
arch/arm/kvm/trace.h
View File

@ -59,10 +59,9 @@ TRACE_EVENT(kvm_guest_fault,
__entry->ipa = ipa;
),
TP_printk("guest fault at PC %#08lx (hxfar %#08lx, "
"ipa %#16llx, hsr %#08lx",
__entry->vcpu_pc, __entry->hxfar,
__entry->ipa, __entry->hsr)
TP_printk("ipa %#llx, hsr %#08lx, hxfar %#08lx, pc %#08lx",
__entry->ipa, __entry->hsr,
__entry->hxfar, __entry->vcpu_pc)
);
TRACE_EVENT(kvm_irq_line,