summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTormod Volden <debian.tormod@gmail.com>2011-11-06 22:01:33 +0100
committerTormod Volden <debian.tormod@gmail.com>2011-11-18 23:52:45 +0100
commit85b3d9260d1f83671e48208a5ef281451ca25604 (patch)
treee6dcc4d51a5a9b8df6179b78858df6e82df2d660
parent55ed0ba7abcf758330b1000cdd1d914cee93dce5 (diff)
lrmi.c: Apply lrmi upstream fix to build on 2.6.26+
http://lrmi.cvs.sourceforge.net/viewvc/lrmi/lrmi/lrmi.c?r1=1.13&r2=1.14 It is recommended to link the upstream lrmi instead of using our in-tree copy, but we will leave a buildable lrmi.c here until major distributions catch up and package lrmi. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=608175 Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
-rw-r--r--lrmi.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/lrmi.c b/lrmi.c
index f5abf93..c2d01ec 100644
--- a/lrmi.c
+++ b/lrmi.c
@@ -26,6 +26,15 @@ This software has NO WARRANTY. Use it at your own risk.
#include "lrmi.h"
+/* flag names changed in 2.6.26 kernel */
+#ifndef TF_MASK
+#define TF_MASK X86_EFLAGS_TF
+#define IF_MASK X86_EFLAGS_IF
+#define IOPL_MASK X86_EFLAGS_IOPL
+#define VIF_MASK X86_EFLAGS_VIF
+#define VIP_MASK X86_EFLAGS_VIP
+#endif
+
#define REAL_MEM_BASE ((void *)0x10000)
#define REAL_MEM_SIZE 0x10000
#define REAL_MEM_BLOCKS 0x100