summaryrefslogtreecommitdiffstats
path: root/arch/ia64/kvm/mmio.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-03-31 06:55:14 +0200
committerDave Airlie <airlied@redhat.com>2010-03-31 06:55:14 +0200
commit3595be778d8cb887f0e0575ef0a0c1a094d120bb (patch)
tree15671ed8bd3597d2efe13aa57b755c66014acb57 /arch/ia64/kvm/mmio.c
parentdrm/radeon/kms: disable MSI on IGP chips (diff)
parentLinux 2.6.34-rc2 (diff)
downloadlinux-3595be778d8cb887f0e0575ef0a0c1a094d120bb.tar.xz
linux-3595be778d8cb887f0e0575ef0a0c1a094d120bb.zip
Merge branch 'v2.6.34-rc2' into drm-linus
Diffstat (limited to 'arch/ia64/kvm/mmio.c')
-rw-r--r--arch/ia64/kvm/mmio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kvm/mmio.c b/arch/ia64/kvm/mmio.c
index 9bf55afd08d0..fb8f9f59a1ed 100644
--- a/arch/ia64/kvm/mmio.c
+++ b/arch/ia64/kvm/mmio.c
@@ -316,8 +316,8 @@ void emulate_io_inst(struct kvm_vcpu *vcpu, u64 padr, u64 ma)
return;
} else {
inst_type = -1;
- panic_vm(vcpu, "Unsupported MMIO access instruction! \
- Bunld[0]=0x%lx, Bundle[1]=0x%lx\n",
+ panic_vm(vcpu, "Unsupported MMIO access instruction! "
+ "Bunld[0]=0x%lx, Bundle[1]=0x%lx\n",
bundle.i64[0], bundle.i64[1]);
}