]>
Commit | Line | Data |
---|---|---|
2bb45ae5 JB |
1 | --- XFree86-4.8.0/xc/lib/Xxf86dga/XF86DGA.c.orig 2005-02-28 17:42:21.000000000 +0100 |
2 | +++ XFree86-4.8.0/xc/lib/Xxf86dga/XF86DGA.c 2013-02-15 19:01:14.491822103 +0100 | |
3 | @@ -19,7 +19,6 @@ | |
4 | #define HAS_MMAP_ANON | |
5 | #include <sys/types.h> | |
6 | #include <sys/mman.h> | |
7 | -#include <asm/page.h> /* PAGE_SIZE */ | |
8 | #define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */ | |
9 | #define HAS_GETPAGESIZE | |
10 | #endif /* linux */ | |
11 | --- XFree86-4.8.0/xc/lib/Xaw/OS.c.orig 2005-02-28 17:42:10.000000000 +0100 | |
12 | +++ XFree86-4.8.0/xc/lib/Xaw/OS.c 2013-02-15 19:48:32.911702986 +0100 | |
13 | @@ -11,7 +11,6 @@ | |
14 | #endif | |
15 | ||
16 | #if defined(linux) | |
17 | -#include <asm/page.h> /* for PAGE_SIZE */ | |
18 | #define HAS_GETPAGESIZE | |
19 | #define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */ | |
20 | #endif | |
21 | --- XFree86-4.8.0/xc/programs/xedit/lisp/lisp.c.orig 2005-10-18 16:37:04.000000000 +0200 | |
22 | +++ XFree86-4.8.0/xc/programs/xedit/lisp/lisp.c 2013-02-15 22:38:05.974609398 +0100 | |
23 | @@ -46,7 +46,6 @@ | |
24 | #endif | |
25 | ||
26 | #if defined(linux) | |
27 | -#include <asm/page.h> /* for PAGE_SIZE */ | |
28 | #define HAS_GETPAGESIZE | |
29 | #define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */ | |
30 | #endif | |
31 | --- XFree86-4.8.0/xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c.orig 2006-03-19 01:22:50.000000000 +0100 | |
32 | +++ XFree86-4.8.0/xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c 2013-02-16 10:17:41.869514501 +0100 | |
33 | @@ -1,5 +1,7 @@ | |
34 | /* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c,v 1.35 2006/03/16 16:50:24 dawes Exp $ */ | |
35 | ||
36 | +#include <unistd.h> | |
37 | + | |
38 | /* all driver need this */ | |
39 | #include "xf86.h" | |
40 | #include "xf86_OSproc.h" | |
41 | @@ -14,8 +16,6 @@ | |
42 | #include "fbdevhw.h" | |
43 | #include "fbpriv.h" | |
44 | ||
45 | -#include "asm/page.h" /* #define for PAGE_* */ | |
46 | - | |
47 | #include "globals.h" | |
48 | #define DPMS_SERVER | |
49 | #include <X11/extensions/dpms.h> | |
50 | @@ -545,6 +545,7 @@ | |
51 | static void | |
52 | calculateFbmem_len(fbdevHWPtr fPtr) | |
53 | { | |
54 | + size_t PAGE_MASK = getconf(_SC_PAGESIZE); | |
55 | fPtr->fboff = (unsigned long) fPtr->fix.smem_start & ~PAGE_MASK; | |
56 | fPtr->fbmem_len = (fPtr->fboff+fPtr->fix.smem_len+~PAGE_MASK) & | |
57 | PAGE_MASK; | |
58 | @@ -555,6 +556,7 @@ | |
59 | fbdevHWMapVidmem(ScrnInfoPtr pScrn) | |
60 | { | |
61 | fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); | |
62 | + size_t PAGE_MASK = getconf(_SC_PAGESIZE); | |
63 | ||
64 | TRACE_ENTER("MapVidmem"); | |
65 | if (NULL == fPtr->fbmem) { | |
66 | @@ -607,6 +609,7 @@ | |
67 | unsigned int mmio_off; | |
68 | ||
69 | fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); | |
70 | + size_t PAGE_MASK = getconf(_SC_PAGESIZE); | |
71 | ||
72 | TRACE_ENTER("MapMMIO"); | |
73 | if (NULL == fPtr->mmio) { | |
74 | @@ -638,6 +641,7 @@ | |
75 | fbdevHWUnmapMMIO(ScrnInfoPtr pScrn) | |
76 | { | |
77 | fbdevHWPtr fPtr = FBDEVHWPTR(pScrn); | |
78 | + size_t PAGE_MASK = getconf(_SC_PAGESIZE); | |
79 | ||
80 | TRACE_ENTER("UnmapMMIO"); | |
81 | if (NULL != fPtr->mmio) { | |
82 | --- XFree86-4.8.0/xc/programs/Xserver/hw/tinyx/vesa/vm86.c.orig 2005-02-28 17:42:55.000000000 +0100 | |
83 | +++ XFree86-4.8.0/xc/programs/Xserver/hw/tinyx/vesa/vm86.c 2013-02-16 17:57:20.158357150 +0100 | |
84 | @@ -269,10 +269,10 @@ | |
85 | return -1; | |
86 | } | |
87 | memcpy(&(LM(vi,vi->ret_code)), retcode_data, sizeof(retcode_data)); | |
88 | - vi->vms.regs.eflags = IF_MASK | IOPL_MASK; | |
89 | + vi->vms.regs.eflags = X86_EFLAGS_IF | X86_EFLAGS_IOPL; | |
90 | vi->vms.regs.ss = POINTER_SEGMENT(vi->stack_base); | |
91 | vi->vms.regs.esp = STACK_SIZE; | |
92 | - PUSHW(vi, IF_MASK | IOPL_MASK); | |
93 | + PUSHW(vi, X86_EFLAGS_IF | X86_EFLAGS_IOPL); | |
94 | PUSHW(vi, POINTER_SEGMENT(vi->ret_code)); | |
95 | PUSHW(vi, POINTER_OFFSET(vi->ret_code)); | |
96 | vi->vms.regs.cs = seg; |