ia64/xen-unstable

changeset 10388:7f67c15e2c91

[IA64] enable Xen compilation with debug=y

Signed-off-by: Tristan Gingold <tristan.gingold@bull.net>
author awilliam@xenbuild.aw
date Thu Jun 15 10:02:53 2006 -0600 (2006-06-15)
parents 75f791c710df
children fbc0e953732e
files xen/arch/ia64/vmx/vlsapic.c xen/arch/ia64/xen/domain.c xen/arch/ia64/xen/xenmisc.c xen/include/asm-ia64/hardirq.h xen/include/asm-ia64/linux/asm/README.origin xen/include/asm-ia64/linux/asm/hardirq.h xen/include/asm-ia64/vmx_vpd.h
line diff
     1.1 --- a/xen/arch/ia64/vmx/vlsapic.c	Thu Jun 15 09:51:58 2006 -0600
     1.2 +++ b/xen/arch/ia64/vmx/vlsapic.c	Thu Jun 15 10:02:53 2006 -0600
     1.3 @@ -388,7 +388,7 @@ void vlsapic_reset(VCPU *vcpu)
     1.4      vcpu->arch.arch_vmx.vlapic.vcpu = vcpu;
     1.5      hvm_vioapic_add_lapic(&vcpu->arch.arch_vmx.vlapic, vcpu);
     1.6  #endif
     1.7 -    DPRINTK("VLSAPIC inservice base=%lp\n", &VLSAPIC_INSVC(vcpu,0) );
     1.8 +    DPRINTK("VLSAPIC inservice base=%p\n", &VLSAPIC_INSVC(vcpu,0) );
     1.9  }
    1.10  
    1.11  /*
     2.1 --- a/xen/arch/ia64/xen/domain.c	Thu Jun 15 09:51:58 2006 -0600
     2.2 +++ b/xen/arch/ia64/xen/domain.c	Thu Jun 15 10:02:53 2006 -0600
     2.3 @@ -209,7 +209,7 @@ static void continue_cpu_idle_loop(void)
     2.4  void startup_cpu_idle_loop(void)
     2.5  {
     2.6  	/* Just some sanity to ensure that the scheduler is set up okay. */
     2.7 -	ASSERT(current->domain == IDLE_DOMAIN_ID);
     2.8 +	ASSERT(current->domain->domain_id == IDLE_DOMAIN_ID);
     2.9  	raise_softirq(SCHEDULE_SOFTIRQ);
    2.10  
    2.11  	continue_cpu_idle_loop();
     3.1 --- a/xen/arch/ia64/xen/xenmisc.c	Thu Jun 15 09:51:58 2006 -0600
     3.2 +++ b/xen/arch/ia64/xen/xenmisc.c	Thu Jun 15 10:02:53 2006 -0600
     3.3 @@ -155,6 +155,10 @@ void arch_dump_domain_info(struct domain
     3.4  {
     3.5  }
     3.6  
     3.7 +void audit_domains_key(unsigned char key)
     3.8 +{
     3.9 +}
    3.10 +
    3.11  void panic_domain(struct pt_regs *regs, const char *fmt, ...)
    3.12  {
    3.13  	va_list args;
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/xen/include/asm-ia64/hardirq.h	Thu Jun 15 10:02:53 2006 -0600
     4.3 @@ -0,0 +1,10 @@
     4.4 +#ifndef __IA64__HARDIRQ__H__
     4.5 +#define __IA64__HARDIRQ__H__
     4.6 +
     4.7 +#define __ARCH_IRQ_STAT	1
     4.8 +#define HARDIRQ_BITS	14
     4.9 +#include <linux/hardirq.h>
    4.10 +
    4.11 +#define local_softirq_pending()		(local_cpu_data->softirq_pending)
    4.12 +
    4.13 +#endif
     5.1 --- a/xen/include/asm-ia64/linux/asm/README.origin	Thu Jun 15 09:51:58 2006 -0600
     5.2 +++ b/xen/include/asm-ia64/linux/asm/README.origin	Thu Jun 15 10:02:53 2006 -0600
     5.3 @@ -18,7 +18,6 @@ div64.h			-> linux/include/asm-ia64/div6
     5.4  dma.h			-> linux/include/asm-ia64/dma.h
     5.5  fpswa.h			-> linux/include/asm-ia64/fpswa.h
     5.6  fpu.h			-> linux/include/asm-ia64/fpu.h
     5.7 -hardirq.h		-> linux/include/asm-ia64/hardirq.h
     5.8  hdreg.h			-> linux/include/asm-ia64/hdreg.h
     5.9  hw_irq.h		-> linux/include/asm-ia64/hw_irq.h
    5.10  intrinsics.h		-> linux/include/asm-ia64/intrinsics.h
     6.1 --- a/xen/include/asm-ia64/linux/asm/hardirq.h	Thu Jun 15 09:51:58 2006 -0600
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,38 +0,0 @@
     6.4 -#ifndef _ASM_IA64_HARDIRQ_H
     6.5 -#define _ASM_IA64_HARDIRQ_H
     6.6 -
     6.7 -/*
     6.8 - * Modified 1998-2002, 2004 Hewlett-Packard Co
     6.9 - *	David Mosberger-Tang <davidm@hpl.hp.com>
    6.10 - */
    6.11 -
    6.12 -#include <linux/config.h>
    6.13 -
    6.14 -#include <linux/threads.h>
    6.15 -#include <linux/irq.h>
    6.16 -
    6.17 -#include <asm/processor.h>
    6.18 -
    6.19 -/*
    6.20 - * No irq_cpustat_t for IA-64.  The data is held in the per-CPU data structure.
    6.21 - */
    6.22 -
    6.23 -#define __ARCH_IRQ_STAT	1
    6.24 -
    6.25 -#define local_softirq_pending()		(local_cpu_data->softirq_pending)
    6.26 -
    6.27 -#define HARDIRQ_BITS	14
    6.28 -
    6.29 -/*
    6.30 - * The hardirq mask has to be large enough to have space for potentially all IRQ sources
    6.31 - * in the system nesting on a single CPU:
    6.32 - */
    6.33 -#if (1 << HARDIRQ_BITS) < NR_IRQS
    6.34 -# error HARDIRQ_BITS is too low!
    6.35 -#endif
    6.36 -
    6.37 -extern void __iomem *ipi_base_addr;
    6.38 -
    6.39 -void ack_bad_irq(unsigned int irq);
    6.40 -
    6.41 -#endif /* _ASM_IA64_HARDIRQ_H */
     7.1 --- a/xen/include/asm-ia64/vmx_vpd.h	Thu Jun 15 09:51:58 2006 -0600
     7.2 +++ b/xen/include/asm-ia64/vmx_vpd.h	Thu Jun 15 10:02:53 2006 -0600
     7.3 @@ -102,7 +102,7 @@ struct arch_vmx_struct {
     7.4  #define vmx_schedule_tail(next)         \
     7.5      (next)->thread.arch_vmx.arch_vmx_schedule_tail((next))
     7.6  
     7.7 -#define VMX_DOMAIN(d)   d->arch.arch_vmx.flags
     7.8 +#define VMX_DOMAIN(v)   v->arch.arch_vmx.flags
     7.9  
    7.10  #define ARCH_VMX_IO_WAIT        3       /* Waiting for I/O completion */
    7.11  #define ARCH_VMX_INTR_ASSIST    4       /* Need DM's assist to issue intr */
    7.12 @@ -111,29 +111,9 @@ struct arch_vmx_struct {
    7.13  
    7.14  #define VMX_DEBUG 1
    7.15  #if VMX_DEBUG
    7.16 -#define DBG_LEVEL_0     (1 << 0)
    7.17 -#define DBG_LEVEL_1     (1 << 1)
    7.18 -#define DBG_LEVEL_2     (1 << 2)
    7.19 -#define DBG_LEVEL_3     (1 << 3)
    7.20 -#define DBG_LEVEL_IO    (1 << 4)
    7.21 -#define DBG_LEVEL_VMMU  (1 << 5)
    7.22 -#define DBG_LEVEL_IOAPIC 	(1 << 6)
    7.23  
    7.24  extern unsigned int opt_vmx_debug_level;
    7.25 -#define VMX_DBG_LOG(level, _f, _a...)           \
    7.26 -    if ((level) & opt_vmx_debug_level)          \
    7.27 -        printk("[VMX]" _f "\n", ## _a )
    7.28 -#else
    7.29 -#define VMX_DBG_LOG(level, _f, _a...)
    7.30  #endif
    7.31 -
    7.32 -#define  __vmx_bug(regs)                                        \
    7.33 -    do {                                                        \
    7.34 -        printk("__vmx_bug at %s:%d\n", __FILE__, __LINE__);     \
    7.35 -        show_registers(regs);                                   \
    7.36 -        domain_crash(current->domain);                          \
    7.37 -    } while (0)
    7.38 -
    7.39  #endif //__ASSEMBLY__
    7.40  
    7.41  // VPD field offset