ia64/xen-unstable

changeset 2963:36472cdf9921

bitkeeper revision 1.1159.170.15 (4195dc2522qCUB8kQ3bVffVY3XIPhg)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk
author cl349@freefall.cl.cam.ac.uk
date Sat Nov 13 10:04:21 2004 +0000 (2004-11-13)
parents a337870b8d18 85a6dfa5c367
children 2b25e0010db8 fc670b022614
files linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h
line diff
     1.1 --- a/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c	Fri Nov 12 18:02:51 2004 +0000
     1.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c	Sat Nov 13 10:04:21 2004 +0000
     1.3 @@ -82,7 +82,7 @@ void force_evtchn_callback(void)
     1.4      (void)HYPERVISOR_xen_version(0);
     1.5  }
     1.6  
     1.7 -void evtchn_do_upcall(struct pt_regs *regs)
     1.8 +asmlinkage void evtchn_do_upcall(struct pt_regs *regs)
     1.9  {
    1.10      unsigned long  l1, l2;
    1.11      unsigned int   l1i, l2i, port;
     2.1 --- a/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h	Fri Nov 12 18:02:51 2004 +0000
     2.2 +++ b/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h	Sat Nov 13 10:04:21 2004 +0000
     2.3 @@ -48,7 +48,7 @@ void force_evtchn_callback(void);
     2.4  void evtchn_do_upcall(struct pt_regs *regs);
     2.5  
     2.6  /* Entry point for notifications into the userland character device. */
     2.7 -void evtchn_device_upcall(int port);
     2.8 +asmlinkage void evtchn_device_upcall(int port);
     2.9  
    2.10  static inline void mask_evtchn(int port)
    2.11  {