Author: daniel
Date: 2003-05-26 01:53:23 -0500 (Mon, 26 May 2003)
New Revision: 57
Modified:
branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_int10.diff
branches/4.3.0/sid/debian/patches/021_riscpc_ioport_fix.diff
Log:
Fixed up the int10 patch from HEAD and the RISC ioport patch to actually apply
cleanly and work ... sigh. I swear I've already fixed this same hunk about 17
times, but there you go.
Modified: branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_int10.diff
==============================================================================
--- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_int10.diff
2003-05-26 06:52:46 UTC (rev 56)
+++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_int10.diff
2003-05-26 06:53:23 UTC (rev 57)
@@ -178,18 +178,18 @@
memType realBase, alignOff;
realBase = Base & ~(getpagesize() - 1);
-@@ -431,19 +432,25 @@
+@@ -429,21 +430,23 @@
+ mapflags |= MAP_NONCACHED;
+ #endif
-#if defined(__ia64__)
-+#if 1
/* this will disappear when people upgrade their kernels */
- if ((fd = open(DEV_MEM, O_RDWR|O_SYNC)) < 0)
+-#else
+- if ((fd = open(DEV_MEM, O_RDWR)) < 0)
+-#endif
+ fd = open(DEV_MEM,
-+ ((flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR) | O_SYNC);
- #else
-- if ((fd = open(DEV_MEM, O_RDWR)) < 0)
-+ fd = open(DEV_MEM, (flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR);
- #endif
++ ((flags & VIDMEM_READONLY) ? O_RDONLY : O_RDWR) | O_SYNC);
+ if (fd < 0)
{
FatalError("xf86MapVidMem: failed to open " DEV_MEM " (%s)\n",
@@ -197,10 +197,10 @@
}
+
+ if (flags & VIDMEM_READONLY)
-+ prot = PROT_READ;
++ prot = PROT_READ;
+ else
-+ prot = PROT_READ | PROT_WRITE;
-+
++ prot = PROT_READ | PROT_WRITE;
++
/* This requires linux-0.99.pl10 or above */
- base = mmap((caddr_t)0, Size + alignOff,
- PROT_READ|PROT_WRITE,
Modified: branches/4.3.0/sid/debian/patches/021_riscpc_ioport_fix.diff
==============================================================================
--- branches/4.3.0/sid/debian/patches/021_riscpc_ioport_fix.diff
2003-05-26 06:52:46 UTC (rev 56)
+++ branches/4.3.0/sid/debian/patches/021_riscpc_ioport_fix.diff
2003-05-26 06:53:23 UTC (rev 57)
@@ -13,7 +13,7 @@
#include "X.h"
#include "input.h"
#include "scrnintstr.h"
-@@ -520,8 +522,12 @@
+@@ -516,8 +518,12 @@
}
close(fd);
#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) &&
!defined(__sh__) && !defined(__hppa__)
