Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b9e4fa0 authored by Gleb Natapov's avatar Gleb Natapov
Browse files

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
parents 9b2d2e0d 1fe40f6d

arch/arm/include/asm/kvm_mmu.h

+1 −1
Original line number Diff line number Diff line
@@ -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.

arch/arm/kvm/interrupts.S

+4 −4
Original line number Diff line number Diff line
@@ -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"

arch/arm/kvm/reset.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

};

arch/arm/kvm/trace.h

+3 −4
Original line number Diff line number Diff line
@@ -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,