1.1 --- a/xen/arch/ia64/xen/irq.c	Tue Apr 11 13:55:36 2006 -0600
     1.2 +++ b/xen/arch/ia64/xen/irq.c	Tue Apr 11 13:55:40 2006 -0600
     1.3 @@ -544,6 +544,47 @@ int pirq_guest_unbind(struct domain *d, 
     1.4      return 0;
     1.5  }
     1.6  
     1.7 +void
     1.8 +xen_debug_irq(unsigned long vector, struct pt_regs *regs)
     1.9 +{
    1.10 +//FIXME: For debug only, can be removed
    1.11 +	static char firstirq = 1;
    1.12 +	static char firsttime[256];
    1.13 +	static char firstpend[256];
    1.14 +	if (firstirq) {
    1.15 +		int i;
    1.16 +		for (i=0;i<256;i++) firsttime[i] = 1;
    1.17 +		for (i=0;i<256;i++) firstpend[i] = 1;
    1.18 +		firstirq = 0;
    1.19 +	}
    1.20 +	if (firsttime[vector]) {
    1.21 +		printf("**** (entry) First received int on vector=%lu,itc=%lx\n",
    1.22 +			(unsigned long) vector, ia64_get_itc());
    1.23 +		firsttime[vector] = 0;
    1.24 +	}
    1.25 +}
    1.26 +
    1.27 +/*
    1.28 + * Exit an interrupt context. Process softirqs if needed and possible:
    1.29 + */
    1.30 +void irq_exit(void)
    1.31 +{
    1.32 +	sub_preempt_count(IRQ_EXIT_OFFSET);
    1.33 +}
    1.34 +
    1.35 +/*
    1.36 + * ONLY gets called from ia64_leave_kernel
    1.37 + * ONLY call with interrupts enabled
    1.38 + */
    1.39 +void process_soft_irq(void)
    1.40 +{
    1.41 +	if (!in_interrupt() && local_softirq_pending()) {
    1.42 +		add_preempt_count(SOFTIRQ_OFFSET);
    1.43 +		do_softirq();
    1.44 +		sub_preempt_count(SOFTIRQ_OFFSET);
    1.45 +	}
    1.46 +}
    1.47 +
    1.48  // this is a temporary hack until real console input is implemented
    1.49  extern void domain_pend_keyboard_interrupt(int irq);
    1.50  irqreturn_t guest_forward_keyboard_input(int irq, void *nada, struct pt_regs *regs)

     2.1 --- a/xen/arch/ia64/xen/xenirq.c	Tue Apr 11 13:55:36 2006 -0600
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,54 +0,0 @@
     2.4 -/*
     2.5 - * Xen irq routines
     2.6 - *
     2.7 - * Copyright (C) 2005 Hewlett-Packard Co.
     2.8 - *	Dan Magenheimer (dan.magenheimer@hp.com)
     2.9 - *
    2.10 - */
    2.11 -
    2.12 -#include <asm/ptrace.h>
    2.13 -#include <asm/hw_irq.h>
    2.14 -#include <asm/delay.h>
    2.15 -
    2.16 -void
    2.17 -xen_debug_irq(ia64_vector vector, struct pt_regs *regs)
    2.18 -{
    2.19 -//FIXME: For debug only, can be removed
    2.20 -	static char firstirq = 1;
    2.21 -	static char firsttime[256];
    2.22 -	static char firstpend[256];
    2.23 -	if (firstirq) {
    2.24 -		int i;
    2.25 -		for (i=0;i<256;i++) firsttime[i] = 1;
    2.26 -		for (i=0;i<256;i++) firstpend[i] = 1;
    2.27 -		firstirq = 0;
    2.28 -	}
    2.29 -	if (firsttime[vector]) {
    2.30 -		printf("**** (entry) First received int on vector=%lu,itc=%lx\n",
    2.31 -			(unsigned long) vector, ia64_get_itc());
    2.32 -		firsttime[vector] = 0;
    2.33 -	}
    2.34 -}
    2.35 -
    2.36 -/*
    2.37 - * Exit an interrupt context. Process softirqs if needed and possible:
    2.38 - */
    2.39 -void irq_exit(void)
    2.40 -{
    2.41 -	sub_preempt_count(IRQ_EXIT_OFFSET);
    2.42 -}
    2.43 -
    2.44 -/*
    2.45 - * ONLY gets called from ia64_leave_kernel
    2.46 - * ONLY call with interrupts enabled
    2.47 - */
    2.48 -void process_soft_irq(void)
    2.49 -{
    2.50 -	if (!in_interrupt() && local_softirq_pending()) {
    2.51 -		add_preempt_count(SOFTIRQ_OFFSET);
    2.52 -		do_softirq();
    2.53 -		sub_preempt_count(SOFTIRQ_OFFSET);
    2.54 -	}
    2.55 -}
    2.56 -
    2.57 -/* end from linux/kernel/softirq.c */