From d51faf6cce847264793c49d0da9c2c715d7086d7 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Tue, 11 Jan 2005 17:18:49 +0000 Subject: bitkeeper revision 1.1159.170.88 (41e40a79WiEU5QHfBOoYWsZfrMacOw) Re-fix segment fixup code for Linux 2.4. --- linux-2.6.10-xen-sparse/arch/xen/kernel/fixup.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/linux-2.6.10-xen-sparse/arch/xen/kernel/fixup.c b/linux-2.6.10-xen-sparse/arch/xen/kernel/fixup.c index 98eb939816..01fe5df942 100644 --- a/linux-2.6.10-xen-sparse/arch/xen/kernel/fixup.c +++ b/linux-2.6.10-xen-sparse/arch/xen/kernel/fixup.c @@ -33,10 +33,17 @@ #include #include #include +#include #define DP(_f) printk(KERN_ALERT " " _f "\n") -fastcall void do_fixup_4gb_segment(struct pt_regs *regs, long error_code) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) +#define __LINKAGE fastcall +#else +#define __LINKAGE asmlinkage +#endif + +__LINKAGE void do_fixup_4gb_segment(struct pt_regs *regs, long error_code) { static unsigned long printed = 0; int i; -- cgit v1.2.3