SOURCES: lrmi-update-v86d.patch (NEW) - update from v86d: - fix build wit...
qboosh
qboosh at pld-linux.org
Wed Jul 30 18:51:54 CEST 2008
Author: qboosh Date: Wed Jul 30 16:51:54 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- update from v86d:
- fix build with Linux 2.6.26+ headers
- mmap BIOS areas with PROT_EXEC
- IVTBDA MAP_SHARED fragment NOT merged - needs investigation (virtual lrmi calls
should have limited access to physical memory)
---- Files affected:
SOURCES:
lrmi-update-v86d.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/lrmi-update-v86d.patch
diff -u /dev/null SOURCES/lrmi-update-v86d.patch:1.1
--- /dev/null Wed Jul 30 18:51:54 2008
+++ SOURCES/lrmi-update-v86d.patch Wed Jul 30 18:51:48 2008
@@ -0,0 +1,26 @@
+--- lrmi-0.10/lrmi.c.orig 2005-12-05 00:44:44.000000000 +0100
++++ lrmi-0.10/lrmi.c 2008-07-30 18:46:00.981332179 +0200
+@@ -61,6 +61,14 @@
+
+ #include "lrmi.h"
+
++/* 2.6.26+ kernels don't define the legacy masks. */
++#if defined(__linux__) && !defined(TF_MASK)
++ #define TF_MASK X86_EFLAGS_TF
++ #define IF_MASK X86_EFLAGS_IF
++ #define VIF_MASK X86_EFLAGS_VIF
++ #define IOPL_MASK X86_EFLAGS_IOPL
++#endif
++
+ #define REAL_MEM_BASE ((void *)0x10000)
+ #define REAL_MEM_SIZE 0x40000
+ #define REAL_MEM_BLOCKS 0x100
+@@ -341,7 +349,7 @@
+ }
+
+ if (!map_file((void *)0xa0000, 0x100000 - 0xa0000,
+- PROT_READ | PROT_WRITE,
++ PROT_READ | PROT_WRITE | PROT_EXEC,
+ MAP_FIXED | MAP_SHARED, "/dev/mem", 0xa0000)) {
+ munmap((void *)0, 0x502);
+ real_mem_deinit();
================================================================
More information about the pld-cvs-commit
mailing list