Attachment #111376 for bug #168527

View | Details | Raw Unified | Return to bug 168527
Collapse All | Expand All

Lines 21-28 Link Here

(-)../tmp-orig/xawtv-3.95/console/fbtools.c (-3 / +1 lines)
21	#include <linux/vt.h>	21	#include <linux/vt.h>
22	#include <linux/fb.h>	22	#include <linux/fb.h>
23		23
24	#include <asm/page.h>
25
26	#include "fbtools.h"	24	#include "fbtools.h"
27		25
28	/* -------------------------------------------------------------------- */	26	/* -------------------------------------------------------------------- */
Lines 424-430 Link Here
424	goto err;	422	goto err;
425	}	423	}
426	#endif	424	#endif
427	fb_mem_offset = (unsigned long)(fb_fix.smem_start) & (~PAGE_MASK);	425	fb_mem_offset = (unsigned long)(fb_fix.smem_start) & ~(sysconf(_SC_PAGE_SIZE)-1);
428	fb_mem = mmap(NULL,fb_fix.smem_len+fb_mem_offset,	426	fb_mem = mmap(NULL,fb_fix.smem_len+fb_mem_offset,
429	PROT_READ\|PROT_WRITE,MAP_SHARED,fb,0);	427	PROT_READ\|PROT_WRITE,MAP_SHARED,fb,0);
430	if (-1L == (long)fb_mem) {	428	if (-1L == (long)fb_mem) {

Lines 9-15 Link Here

(-)../tmp-orig/xawtv-3.95/console/matrox.c (-2 / +1 lines)
9	#include <sys/ioctl.h>	9	#include <sys/ioctl.h>
10	#include <sys/mman.h>	10	#include <sys/mman.h>
11		11
12	#include <asm/page.h> /* PAGE_SIZE */
13	#include <linux/fb.h>	12	#include <linux/fb.h>
14		13
15	#include "byteswap.h"	14	#include "byteswap.h"
Lines 226-232 Link Here
226	return -1;	225	return -1;
227	}	226	}
228	off = (unsigned long)fb_fix.mmio_start -	227	off = (unsigned long)fb_fix.mmio_start -
229	((unsigned long)fb_fix.mmio_start & ~(PAGE_SIZE-1));	228	((unsigned long)fb_fix.mmio_start & ~(sysconf(_SC_PAGE_SIZE)-1));
230	bmmio += off;	229	bmmio += off;
231	mmio = (uint32_t*)bmmio;	230	mmio = (uint32_t*)bmmio;
232	return 0;	231	return 0;

Return to bug 168527