diff options
| author | cl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk> | 2004-11-13 10:04:21 +0000 |
|---|---|---|
| committer | cl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk> | 2004-11-13 10:04:21 +0000 |
| commit | 952ded00de89abf78b38fafda164a1a9d7501c2c (patch) | |
| tree | f989e050fa259e82617ed22a7829cb6a89b7b3a6 | |
| parent | 0759afe76d3265cc7a8e34373c8bd94096bc856b (diff) | |
| parent | 231d079a6c041efca7a65b496cc34b11678b5b8b (diff) | |
| download | xen-952ded00de89abf78b38fafda164a1a9d7501c2c.tar.gz xen-952ded00de89abf78b38fafda164a1a9d7501c2c.tar.bz2 xen-952ded00de89abf78b38fafda164a1a9d7501c2c.zip | |
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
| -rw-r--r-- | linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c | 2 | ||||
| -rw-r--r-- | linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c b/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c index 28dca535d9..0041caa9bf 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c +++ b/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c @@ -82,7 +82,7 @@ void force_evtchn_callback(void) (void)HYPERVISOR_xen_version(0); } -void evtchn_do_upcall(struct pt_regs *regs) +asmlinkage void evtchn_do_upcall(struct pt_regs *regs) { unsigned long l1, l2; unsigned int l1i, l2i, port; diff --git a/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h b/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h index bf27321263..a4930a09d5 100644 --- a/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h +++ b/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h @@ -48,7 +48,7 @@ void force_evtchn_callback(void); void evtchn_do_upcall(struct pt_regs *regs); /* Entry point for notifications into the userland character device. */ -void evtchn_device_upcall(int port); +asmlinkage void evtchn_device_upcall(int port); static inline void mask_evtchn(int port) { |