ia64/xen-unstable

changeset 2104:4c3d4467e243

bitkeeper revision 1.1159 (41137149kQ0eVoHQjKc8FK_iYKQPyQ)

A better build fix for 2.4.
author kaf24@scramble.cl.cam.ac.uk
date Fri Aug 06 11:53:45 2004 +0000 (2004-08-06)
parents 47f04385bb81
children 777ddc539761 bf212ae2e94c
files linux-2.4.26-xen-sparse/arch/xen/kernel/Makefile linux-2.6.7-xen-sparse/arch/xen/kernel/evtchn.c
line diff
     1.1 --- a/linux-2.4.26-xen-sparse/arch/xen/kernel/Makefile	Fri Aug 06 11:50:09 2004 +0000
     1.2 +++ b/linux-2.4.26-xen-sparse/arch/xen/kernel/Makefile	Fri Aug 06 11:53:45 2004 +0000
     1.3 @@ -6,7 +6,7 @@ all: kernel.o head.o init_task.o
     1.4  
     1.5  O_TARGET := kernel.o
     1.6  
     1.7 -export-objs     := i386_ksyms.o evtchn.o
     1.8 +export-objs     := i386_ksyms.o
     1.9  
    1.10  obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o  \
    1.11  		ptrace.o ioport.o ldt.o setup.o time.o sys_i386.o \
     2.1 --- a/linux-2.6.7-xen-sparse/arch/xen/kernel/evtchn.c	Fri Aug 06 11:50:09 2004 +0000
     2.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/kernel/evtchn.c	Fri Aug 06 11:53:45 2004 +0000
     2.3 @@ -12,6 +12,7 @@
     2.4  #include <linux/interrupt.h>
     2.5  #include <linux/sched.h>
     2.6  #include <linux/kernel_stat.h>
     2.7 +#include <linux/version.h>
     2.8  #include <asm/atomic.h>
     2.9  #include <asm/system.h>
    2.10  #include <asm/ptrace.h>
    2.11 @@ -82,7 +83,9 @@ void evtchn_do_upcall(struct pt_regs *re
    2.12  
    2.13      local_irq_restore(flags);
    2.14  }
    2.15 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
    2.16  EXPORT_SYMBOL(evtchn_do_upcall);
    2.17 +#endif
    2.18  
    2.19  static int find_unbound_irq(void)
    2.20  {