# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID cd1df13fb1c4f6d18a13ca806dea67bd90189c29
# Parent cf66d644b4d66ad26d1d58b2bd7135848a44da00
[IA64] Removed warning messages
Signed-off-by: Masaki Kanno <kanno.masaki@xxxxxxxxxxxxxx>
---
xen/arch/ia64/linux-xen/unaligned.c | 2 +-
xen/arch/ia64/vmx/vmx_vcpu.c | 2 +-
xen/arch/ia64/vmx/vtlb.c | 6 +++---
xen/arch/ia64/xen/process.c | 10 +++++-----
4 files changed, 10 insertions(+), 10 deletions(-)
diff -r cf66d644b4d6 -r cd1df13fb1c4 xen/arch/ia64/linux-xen/unaligned.c
--- a/xen/arch/ia64/linux-xen/unaligned.c Mon May 08 12:52:12 2006 -0600
+++ b/xen/arch/ia64/linux-xen/unaligned.c Mon May 08 12:56:57 2006 -0600
@@ -377,7 +377,7 @@ get_rse_reg (struct pt_regs *regs, unsig
if (ridx >= sof) {
/* read of out-of-frame register returns an undefined value; 0 in our
case. */
DPRINT("ignoring read from r%lu; only %lu registers are allocated!\n",
r1, sof);
- panic("wrong stack register number (iip=%p)\n", regs->cr_iip);
+ panic("wrong stack register number (iip=%lx)\n", regs->cr_iip);
}
if (ridx < sor)
diff -r cf66d644b4d6 -r cd1df13fb1c4 xen/arch/ia64/vmx/vmx_vcpu.c
--- a/xen/arch/ia64/vmx/vmx_vcpu.c Mon May 08 12:52:12 2006 -0600
+++ b/xen/arch/ia64/vmx/vmx_vcpu.c Mon May 08 12:56:57 2006 -0600
@@ -206,7 +206,7 @@ IA64FAULT vmx_vcpu_set_rr(VCPU *vcpu, UI
vcpu_get_rr(vcpu, reg, &oldrr.rrval);
newrr.rrval=val;
if (newrr.rid >= (1 << vcpu->domain->arch.rid_bits))
- panic_domain (NULL, "use of invalid rid %lx\n", newrr.rid);
+ panic_domain (NULL, "use of invalid rid %x\n", newrr.rid);
if(oldrr.ps!=newrr.ps){
thash_purge_all(vcpu);
}
diff -r cf66d644b4d6 -r cd1df13fb1c4 xen/arch/ia64/vmx/vtlb.c
--- a/xen/arch/ia64/vmx/vtlb.c Mon May 08 12:52:12 2006 -0600
+++ b/xen/arch/ia64/vmx/vtlb.c Mon May 08 12:56:57 2006 -0600
@@ -390,9 +390,9 @@ void vtlb_insert(thash_cb_t *hcb, u64 pt
vcpu_get_rr(current, va, &vrr.rrval);
if (vrr.ps != ps) {
// machine_tlb_insert(hcb->vcpu, entry);
- panic_domain(NULL, "not preferred ps with va: 0x%lx vrr.ps=%d ps=%d\n",
- va, vrr.ps, ps);
- return;
+ panic_domain(NULL, "not preferred ps with va: 0x%lx vrr.ps=%d
ps=%ld\n",
+ va, vrr.ps, ps);
+ return;
}
hash_table = vsa_thash(hcb->pta, va, vrr.rrval, &tag);
if( INVALID_TLB(hash_table) ) {
diff -r cf66d644b4d6 -r cd1df13fb1c4 xen/arch/ia64/xen/process.c
--- a/xen/arch/ia64/xen/process.c Mon May 08 12:52:12 2006 -0600
+++ b/xen/arch/ia64/xen/process.c Mon May 08 12:56:57 2006 -0600
@@ -195,10 +195,10 @@ void check_bad_nested_interruption(unsig
}
vector &= ~0xf;
if (vector != IA64_DATA_TLB_VECTOR &&
- vector != IA64_ALT_DATA_TLB_VECTOR &&
- vector != IA64_VHPT_TRANS_VECTOR) {
-panic_domain(regs,"psr.ic off, delivering
fault=%lx,ipsr=%p,iip=%p,ifa=%p,isr=%p,PSCB.iip=%p\n",
- vector,regs->cr_ipsr,regs->cr_iip,PSCB(v,ifa),isr,PSCB(v,iip));
+ vector != IA64_ALT_DATA_TLB_VECTOR &&
+ vector != IA64_VHPT_TRANS_VECTOR) {
+ panic_domain(regs,"psr.ic off, delivering
fault=%lx,ipsr=%lx,iip=%lx,ifa=%lx,isr=%lx,PSCB.iip=%lx\n",
+
vector,regs->cr_ipsr,regs->cr_iip,PSCB(v,ifa),isr,PSCB(v,iip));
}
}
@@ -358,7 +358,7 @@ ia64_fault (unsigned long vector, unsign
struct pt_regs *regs = (struct pt_regs *) &stack;
unsigned long code;
char buf[128];
- static const char * const reason[] = {
+ static const char *reason[] = {
"IA-64 Illegal Operation fault",
"IA-64 Privileged Operation fault",
"IA-64 Privileged Register fault",
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home