[IA64] enable Xen compilation with debug=y

Signed-off-by: Tristan Gingold <tristan.gingold@bull.net>

diff --git a/xen/arch/ia64/vmx/vlsapic.c b/xen/arch/ia64/vmx/vlsapic.c
index dab483a8a0f92d63925f2c4ef48a6172ac144b4c..48510bfc8cefc089245a1510b37a96c6b5c3360d 100644 (file)
--- a/xen/arch/ia64/vmx/vlsapic.c
+++ b/xen/arch/ia64/vmx/vlsapic.c
@@ -388,7 +388,7 @@ void vlsapic_reset(VCPU *vcpu)
     vcpu->arch.arch_vmx.vlapic.vcpu = vcpu;
     hvm_vioapic_add_lapic(&vcpu->arch.arch_vmx.vlapic, vcpu);
 #endif
-    DPRINTK("VLSAPIC inservice base=%lp\n", &VLSAPIC_INSVC(vcpu,0) );
+    DPRINTK("VLSAPIC inservice base=%p\n", &VLSAPIC_INSVC(vcpu,0) );
 }
 
 /*

diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c
index 939b27e5e3f142ecc9865549cb2c977880438e68..e42b3249debec9281ef24fd81a6b735f1f2bcacf 100644 (file)
--- a/xen/arch/ia64/xen/domain.c
+++ b/xen/arch/ia64/xen/domain.c
@@ -209,7 +209,7 @@ static void continue_cpu_idle_loop(void)
 void startup_cpu_idle_loop(void)
 {
        /* Just some sanity to ensure that the scheduler is set up okay. */
-       ASSERT(current->domain == IDLE_DOMAIN_ID);
+       ASSERT(current->domain->domain_id == IDLE_DOMAIN_ID);
        raise_softirq(SCHEDULE_SOFTIRQ);
 
        continue_cpu_idle_loop();

diff --git a/xen/arch/ia64/xen/xenmisc.c b/xen/arch/ia64/xen/xenmisc.c
index ca40c7b2fe08819d90d3a7878053f32722db11c8..ea10d97c6f477b1ddc2f97f7e20757a949bd727a 100644 (file)
--- a/xen/arch/ia64/xen/xenmisc.c
+++ b/xen/arch/ia64/xen/xenmisc.c
@@ -155,6 +155,10 @@ void arch_dump_domain_info(struct domain *d)
 {
 }
 
+void audit_domains_key(unsigned char key)
+{
+}
+
 void panic_domain(struct pt_regs *regs, const char *fmt, ...)
 {
        va_list args;

diff --git a/xen/include/asm-ia64/hardirq.h b/xen/include/asm-ia64/hardirq.h
new file mode 100644 (file)
index 0000000..b78d0c5
--- /dev/null
+++ b/xen/include/asm-ia64/hardirq.h
@@ -0,0 +1,10 @@
+#ifndef __IA64__HARDIRQ__H__
+#define __IA64__HARDIRQ__H__
+
+#define __ARCH_IRQ_STAT        1
+#define HARDIRQ_BITS   14
+#include <linux/hardirq.h>
+
+#define local_softirq_pending()                (local_cpu_data->softirq_pending)
+
+#endif

diff --git a/xen/include/asm-ia64/linux/asm/README.origin b/xen/include/asm-ia64/linux/asm/README.origin
index dc4a0495dfcd252c87a8a4c5cb55691f377085f4..cd31d32dee02b0c6cd36bba49c5f67d937eca37f 100644 (file)
--- a/xen/include/asm-ia64/linux/asm/README.origin
+++ b/xen/include/asm-ia64/linux/asm/README.origin
@@ -18,7 +18,6 @@ div64.h                       -> linux/include/asm-ia64/div64.h
 dma.h                  -> linux/include/asm-ia64/dma.h
 fpswa.h                        -> linux/include/asm-ia64/fpswa.h
 fpu.h                  -> linux/include/asm-ia64/fpu.h
-hardirq.h              -> linux/include/asm-ia64/hardirq.h
 hdreg.h                        -> linux/include/asm-ia64/hdreg.h
 hw_irq.h               -> linux/include/asm-ia64/hw_irq.h
 intrinsics.h           -> linux/include/asm-ia64/intrinsics.h

diff --git a/xen/include/asm-ia64/linux/asm/hardirq.h b/xen/include/asm-ia64/linux/asm/hardirq.h
deleted file mode 100644 (file)
index 33ef8f0..0000000
--- a/xen/include/asm-ia64/linux/asm/hardirq.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef _ASM_IA64_HARDIRQ_H
-#define _ASM_IA64_HARDIRQ_H
-
-/*
- * Modified 1998-2002, 2004 Hewlett-Packard Co
- *     David Mosberger-Tang <davidm@hpl.hp.com>
- */
-
-#include <linux/config.h>
-
-#include <linux/threads.h>
-#include <linux/irq.h>
-
-#include <asm/processor.h>
-
-/*
- * No irq_cpustat_t for IA-64.  The data is held in the per-CPU data structure.
- */
-
-#define __ARCH_IRQ_STAT        1
-
-#define local_softirq_pending()                (local_cpu_data->softirq_pending)
-
-#define HARDIRQ_BITS   14
-
-/*
- * The hardirq mask has to be large enough to have space for potentially all IRQ sources
- * in the system nesting on a single CPU:
- */
-#if (1 << HARDIRQ_BITS) < NR_IRQS
-# error HARDIRQ_BITS is too low!
-#endif
-
-extern void __iomem *ipi_base_addr;
-
-void ack_bad_irq(unsigned int irq);
-
-#endif /* _ASM_IA64_HARDIRQ_H */

diff --git a/xen/include/asm-ia64/vmx_vpd.h b/xen/include/asm-ia64/vmx_vpd.h
index dc38592d11e47049e37e5dbbe35f6a3bd170a252..d3f15f35cf63389cca640a626441e9c1f5b362d4 100644 (file)
--- a/xen/include/asm-ia64/vmx_vpd.h
+++ b/xen/include/asm-ia64/vmx_vpd.h
@@ -102,7 +102,7 @@ struct arch_vmx_struct {
 #define vmx_schedule_tail(next)         \
     (next)->thread.arch_vmx.arch_vmx_schedule_tail((next))
 
-#define VMX_DOMAIN(d)   d->arch.arch_vmx.flags
+#define VMX_DOMAIN(v)   v->arch.arch_vmx.flags
 
 #define ARCH_VMX_IO_WAIT        3       /* Waiting for I/O completion */
 #define ARCH_VMX_INTR_ASSIST    4       /* Need DM's assist to issue intr */
@@ -111,29 +111,9 @@ struct arch_vmx_struct {
 
 #define VMX_DEBUG 1
 #if VMX_DEBUG
-#define DBG_LEVEL_0     (1 << 0)
-#define DBG_LEVEL_1     (1 << 1)
-#define DBG_LEVEL_2     (1 << 2)
-#define DBG_LEVEL_3     (1 << 3)
-#define DBG_LEVEL_IO    (1 << 4)
-#define DBG_LEVEL_VMMU  (1 << 5)
-#define DBG_LEVEL_IOAPIC       (1 << 6)
 
 extern unsigned int opt_vmx_debug_level;
-#define VMX_DBG_LOG(level, _f, _a...)           \
-    if ((level) & opt_vmx_debug_level)          \
-        printk("[VMX]" _f "\n", ## _a )
-#else
-#define VMX_DBG_LOG(level, _f, _a...)
 #endif
-
-#define  __vmx_bug(regs)                                        \
-    do {                                                        \
-        printk("__vmx_bug at %s:%d\n", __FILE__, __LINE__);     \
-        show_registers(regs);                                   \
-        domain_crash(current->domain);                          \
-    } while (0)
-
 #endif //__ASSEMBLY__
 
 // VPD field offset