>Number:         20876
>Category:       xsrc
>Synopsis:       aperture driver won't build
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    xsrc-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Mar 24 05:07:00 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Pavel Cahyna
>Release:        1.6_STABLE
>Organization:
>Environment:
NetBSD k2 1.6_STABLE NetBSD 1.6_STABLE (EISA-DEBUG: ep bez resetu, 
DEBUG, DIAGNOSTIC, odesilani multicastu) #4: Mon Feb 10 22:06:29 CET 
2003     build@omega:/obj/kernobjdir/i386/EISA-DEBUG i386
>Description:
when trying to build the aperture driver on an i386 machine from 
latest sources, I encounter this error:

cc -O2 -ffreestanding  -Wall -Wstrict-prototypes -Wmissing-prototypes
-Wpointer-arith -Wno-uninitialized  -Werror   -nostdinc -I.
-I/home/pc/aperture/module -isystem /sys -isystem /sys/arch -D_KERNEL 
-D_LKM  -c aperture.c
aperture.c:123: conflicting types for `xf86mmap'
xf86_mod.h:14: previous declaration of `xf86mmap'
*** Error code 1

Stop.
make: stopped in /home/pc/aperture/module
*** Error code 1

Stop.
make: stopped in /home/pc/aperture
*** Error code 1

Stop.
make: stopped in /home/pc/aperture

BTW I have /usr/src NFS mounted from an alpha, hope this doesn't 
change anything.
>How-To-Repeat:
download
http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/xsrc/xc/programs/Xserver/hw/xfree86/etc/apNetBSD.shar?rev=1.3
unpack it
type make build
>Fix:
Those two patches fix it (with another similar problem which shows up when the
first problem is solved):


--- cut here ---
===================================================================
RCS file: aperture.c,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -r1.1 -r1.3
--- aperture.c  2003/03/15 15:12:21     1.1
+++ aperture.c  2003/03/15 15:28:03     1.3
@@ -118,10 +118,10 @@
  * allow only section in the vga framebuffer and above main memory 
  * to be mapped
  */
-int
+paddr_t
 xf86mmap(dev, offset, length)
        dev_t dev;
-       int offset;
+       off_t offset;
        int length;
 {
 
--- cut here ---

and

--- cut here ---
===================================================================
RCS file: xf86_reg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xf86_reg.h  2003/03/15 15:32:36     1.1
+++ xf86_reg.h  2003/03/15 15:37:24     1.2
@@ -21,6 +21,7 @@
 /*
  * XXX - These belong to cpufunc.h
  */
+ /*
 static __inline u_int64_t
 rdmsr(u_int msr)
 {
@@ -41,6 +42,8 @@
 {
        __asm __volatile(".byte 0x0f, 0x30" : : "A" (newval), "c"
(msr));
 }
+
+*/
 
 #ifndef M_MEMDESC
 #define M_MEMDESC M_TEMP               /* XXX */
--- cut here ---
>Release-Note:
>Audit-Trail:
>Unformatted: