diff options
| author | Gleb Natapov <gleb@redhat.com> | 2013-09-01 10:48:18 +0300 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-09-01 10:48:18 +0300 |
| commit | 6b9e4fa07443f5baf5bbd7ab043abd6976f8d7bc (patch) | |
| tree | 268566f7aa477b488a73bde987265318160d6fcc /arch/arm/kvm/interrupts.S | |
| parent | 9b2d2e0df8a49414b1e5bc89148c9984dd87782a (diff) | |
| parent | 1fe40f6d39d23f39e643607a3e1883bfc74f1244 (diff) | |
| download | op-kernel-dev-6b9e4fa07443f5baf5bbd7ab043abd6976f8d7bc.zip op-kernel-dev-6b9e4fa07443f5baf5bbd7ab043abd6976f8d7bc.tar.gz | |
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
Diffstat (limited to 'arch/arm/kvm/interrupts.S')
| -rw-r--r-- | arch/arm/kvm/interrupts.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/kvm/interrupts.S b/arch/arm/kvm/interrupts.S index 16cd4ba..85dd84b 100644 --- a/arch/arm/kvm/interrupts.S +++ b/arch/arm/kvm/interrupts.S @@ -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" |
