aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>2005-01-11 17:18:49 +0000
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>2005-01-11 17:18:49 +0000
commitd51faf6cce847264793c49d0da9c2c715d7086d7 (patch)
treef922ba1812ba676d1e7ce4a41023e574ca63d4ec
parentddfa46ba19e701ab23e00cabfbd157ba55ad83a1 (diff)
downloadxen-d51faf6cce847264793c49d0da9c2c715d7086d7.tar.gz
xen-d51faf6cce847264793c49d0da9c2c715d7086d7.tar.bz2
xen-d51faf6cce847264793c49d0da9c2c715d7086d7.zip
bitkeeper revision 1.1159.170.88 (41e40a79WiEU5QHfBOoYWsZfrMacOw)RELEASE-2.0.3
Re-fix segment fixup code for Linux 2.4.
-rw-r--r--linux-2.6.10-xen-sparse/arch/xen/kernel/fixup.c9
1 files changed, 8 insertions, 1 deletions
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 <linux/slab.h>
#include <linux/kernel.h>
#include <linux/delay.h>
+#include <linux/version.h>
#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;