]> git.ipfire.org Git - people/ms/ipfire-3.x.git/blame - lrmi/patches/lrmi-0.10-newheaders.patch
tzdata: Update to 2014j
[people/ms/ipfire-3.x.git] / lrmi / patches / lrmi-0.10-newheaders.patch
CommitLineData
045ee659
MT
1diff -up lrmi-0.10/lrmi.c.BAD lrmi-0.10/lrmi.c
2--- lrmi-0.10/lrmi.c.BAD 2008-09-17 14:41:28.000000000 -0400
3+++ lrmi-0.10/lrmi.c 2008-09-17 14:45:17.000000000 -0400
4@@ -239,7 +239,7 @@ LRMI_free_real(void *m)
5
6
7 #if defined(__linux__)
8-#define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK)
9+#define DEFAULT_VM86_FLAGS (X86_EFLAGS_IF | X86_EFLAGS_IOPL)
10 #elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
11 #define DEFAULT_VM86_FLAGS (PSL_I | PSL_IOPL)
12 #define TF_MASK PSL_T
13@@ -822,7 +822,7 @@ run_vm86(void)
14
15 CONTEXT_REGS.REG(cs) = get_int_seg(v);
16 CONTEXT_REGS.REG(eip) = get_int_off(v);
17- CONTEXT_REGS.REG(eflags) &= ~(VIF_MASK | TF_MASK);
18+ CONTEXT_REGS.REG(eflags) &= ~(X86_EFLAGS_VIF | X86_EFLAGS_TF);
19
20 continue;
21 }
22@@ -862,7 +862,7 @@ vm86_callback(int sig, int code, struct
23
24 CONTEXT_REGS.REG(cs) = get_int_seg(v);
25 CONTEXT_REGS.REG(eip) = get_int_off(v);
26- CONTEXT_REGS.REG(eflags) &= ~(VIF_MASK | TF_MASK);
27+ CONTEXT_REGS.REG(eflags) &= ~(X86_EFLAGS_VIF | X86_EFLAGS_TF);
28
29 break;
30 }
31@@ -916,7 +916,7 @@ vm86_callback(int sig, int code, struct
32
33 CONTEXT_REGS.REG(cs) = get_int_seg(addr[1]);
34 CONTEXT_REGS.REG(eip) = get_int_off(addr[1]);
35- CONTEXT_REGS.REG(eflags) &= ~(VIF_MASK | TF_MASK);
36+ CONTEXT_REGS.REG(eflags) &= ~(X86_EFLAGS_VIF | X86_EFLAGS_TF);
37 } else {
38 if (emulate() == 0) {
39 context.success = 0;