[patch] xawtv-3.95-pagemask-fix.patch

xawtv-3.95-pagemask-fix.patch (text/plain), 1.43 KB, created by Nicolas Boichat on 2007-02-27 06:23:56 UTC

Patch from Andreas Jochens
http://lists.debian.org/debian-qa-packages/2006/08/msg00519.html

diff -urN ../tmp-orig/xawtv-3.95/console/fbtools.c ./console/fbtools.c
--- ../tmp-orig/xawtv-3.95/console/fbtools.c	2003-02-14 14:14:04.000000000 +0000
+++ ./console/fbtools.c	2006-08-23 10:57:40.000000000 +0000
@@ -21,8 +21,6 @@
 #include <linux/vt.h>
 #include <linux/fb.h>
 
-#include <asm/page.h>
-
 #include "fbtools.h"
 
 /* -------------------------------------------------------------------- */
@@ -424,7 +422,7 @@
 	goto err;
     }
 #endif
-    fb_mem_offset = (unsigned long)(fb_fix.smem_start) & (~PAGE_MASK);
+    fb_mem_offset = (unsigned long)(fb_fix.smem_start) & ~(sysconf(_SC_PAGE_SIZE)-1);
     fb_mem = mmap(NULL,fb_fix.smem_len+fb_mem_offset,
 		  PROT_READ|PROT_WRITE,MAP_SHARED,fb,0);
     if (-1L == (long)fb_mem) {
diff -urN ../tmp-orig/xawtv-3.95/console/matrox.c ./console/matrox.c
--- ../tmp-orig/xawtv-3.95/console/matrox.c	2005-02-03 10:40:41.000000000 +0000
+++ ./console/matrox.c	2006-08-23 11:09:51.000000000 +0000
@@ -9,7 +9,6 @@
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 
-#include <asm/page.h> /* PAGE_SIZE */
 #include <linux/fb.h>
 
 #include "byteswap.h"
@@ -226,7 +225,7 @@
 	return -1;
     }
     off = (unsigned long)fb_fix.mmio_start -
-	((unsigned long)fb_fix.mmio_start & ~(PAGE_SIZE-1));
+	((unsigned long)fb_fix.mmio_start & ~(sysconf(_SC_PAGE_SIZE)-1));
     bmmio += off;
     mmio = (uint32_t*)bmmio;
     return 0;