build.sh fails on sys/modules/i915drm in 5_Stable

[yancm%sdf.lonestar.org@localhost]

Dear List,

I currently have an i386 system at 5_Stable (built from
source April 24, 2009).

I just updated my source tree and I had already built tools and kernel...

Was attempting to build distribution:
./build.sh -O ../obj -T ../tools -u distribution

Build was progressing OK then the failure messages:
dependall ===> sys/modules/i915drm
#   compile  i915drm/i915_mem.o
/usr/src/../tools/bin/i386--netbsdelf-gcc -O2 -Wall -Wstrict-prototypes
-Wmissing-prototypes -Wpointer-arith -Wno-sign-compare -Wno-traditional
-Wa,--fatal-warnings  -Werror  -ffreestanding  -fno-strict-aliasing
-Wno-pointer-sign  -I/usr/src/common/include
-I/usr/src/sys/external/bsd/drm/dist/bsd-core 
-I/usr/src/sys/external/bsd/drm/dist/shared-core -I/usr/src/common/include
 -nostdinc -I. -I/usr/src/sys/modules/i915drm -isystem /usr/src/sys
-isystem /usr/src/sys/arch -isystem /usr/src/sys/../common/include
-D_KERNEL -D_LKM -D_MODULE -c    /usr/src/sys/dev/pci/drm/i915_mem.c
In file included from /usr/src/sys/dev/pci/drm/i915_mem.c:40:
/usr/src/sys/dev/pci/drm/i915_drv.h:76: error: expected
specifier-qualifier-list before 'DRMFILE'
/usr/src/sys/dev/pci/drm/i915_drv.h:112: error: expected ')' before '*' token
/usr/src/sys/dev/pci/drm/i915_drv.h:114: error: expected ')' before '*' token
/usr/src/sys/dev/pci/drm/i915_drv.h:115: error: expected ')' before '*' token
/usr/src/sys/dev/pci/drm/i915_drv.h:116: error: expected ')' before '*' token
cc1: warnings being treated as errors
/usr/src/sys/dev/pci/drm/i915_drv.h:121: warning: parameter names (without
types) in function declaration
/usr/src/sys/dev/pci/drm/i915_drv.h:122: warning: parameter names (without
types) in function declaration
/usr/src/sys/dev/pci/drm/i915_drv.h:124: error: expected ')' before '*' token
/usr/src/sys/dev/pci/drm/i915_drv.h:126: error: expected ')' before '*' token
/usr/src/sys/dev/pci/drm/i915_drv.h:127: error: expected ')' before '*' token
/usr/src/sys/dev/pci/drm/i915_drv.h:128: error: expected ')' before '*' token
/usr/src/sys/dev/pci/drm/i915_drv.h:129: warning: parameter names (without
types) in function declaration
/usr/src/sys/dev/pci/drm/i915_drv.h:130: warning: parameter names (without
types) in function declaration
/usr/src/sys/dev/pci/drm/i915_drv.h:133: warning: parameter names (without
types) in function declaration
/usr/src/sys/dev/pci/drm/i915_drv.h:134: warning: parameter names (without
types) in function declaration
/usr/src/sys/dev/pci/drm/i915_drv.h:135: warning: parameter names (without
types) in function declaration
/usr/src/sys/dev/pci/drm/i915_drv.h:136: warning: parameter names (without
types) in function declaration
/usr/src/sys/dev/pci/drm/i915_drv.h:138: error: expected ')' before '*' token
/usr/src/sys/dev/pci/drm/i915_drv.h:178: error: expected ')' before '*' token
/usr/src/sys/dev/pci/drm/i915_mem.c:54: error: expected ')' before '*' token
/usr/src/sys/dev/pci/drm/i915_mem.c:100: error: expected declaration
specifiers or '...' before 'DRMFILE'
/usr/src/sys/dev/pci/drm/i915_mem.c: In function 'split_block':
/usr/src/sys/dev/pci/drm/i915_mem.c:110: error: 'struct mem_block' has no
member named 'filp'
/usr/src/sys/dev/pci/drm/i915_mem.c:127: error: 'struct mem_block' has no
member named 'filp'
/usr/src/sys/dev/pci/drm/i915_mem.c:137: error: 'struct mem_block' has no
member named 'filp'
/usr/src/sys/dev/pci/drm/i915_mem.c:137: error: 'filp' undeclared (first
use in this function)
/usr/src/sys/dev/pci/drm/i915_mem.c:137: error: (Each undeclared
identifier is reported only once
/usr/src/sys/dev/pci/drm/i915_mem.c:137: error: for each function it
appears in.)
/usr/src/sys/dev/pci/drm/i915_mem.c: At top level:
/usr/src/sys/dev/pci/drm/i915_mem.c:142: error: expected declaration
specifiers or '...' before 'DRMFILE'
/usr/src/sys/dev/pci/drm/i915_mem.c: In function 'alloc_block':
/usr/src/sys/dev/pci/drm/i915_mem.c:149: error: 'struct mem_block' has no
member named 'filp'
/usr/src/sys/dev/pci/drm/i915_mem.c:150: error: 'filp' undeclared (first
use in this function)
/usr/src/sys/dev/pci/drm/i915_mem.c:150: error: too many arguments to
function 'split_block'
/usr/src/sys/dev/pci/drm/i915_mem.c: In function 'free_block':
/usr/src/sys/dev/pci/drm/i915_mem.c:169: error: 'struct mem_block' has no
member named 'filp'
/usr/src/sys/dev/pci/drm/i915_mem.c:174: error: 'struct mem_block' has no
member named 'filp'
/usr/src/sys/dev/pci/drm/i915_mem.c:182: error: 'struct mem_block' has no
member named 'filp'
/usr/src/sys/dev/pci/drm/i915_mem.c: In function 'init_heap':
/usr/src/sys/dev/pci/drm/i915_mem.c:208: error: 'struct mem_block' has no
member named 'filp'
/usr/src/sys/dev/pci/drm/i915_mem.c:212: error: 'struct mem_block' has no
member named 'filp'
/usr/src/sys/dev/pci/drm/i915_mem.c:212: error: 'DRMFILE' undeclared
(first use in this function)
/usr/src/sys/dev/pci/drm/i915_mem.c: At top level:
/usr/src/sys/dev/pci/drm/i915_mem.c:219: error: expected ')' before '*' token
/usr/src/sys/dev/pci/drm/i915_mem.c:279: warning: function declaration
isn't a prototype
/usr/src/sys/dev/pci/drm/i915_mem.c: In function 'i915_mem_alloc':
/usr/src/sys/dev/pci/drm/i915_mem.c:280: error: 'DRM_DEVICE' undeclared
(first use in this function)
/usr/src/sys/dev/pci/drm/i915_mem.c:281: error: 'dev' undeclared (first
use in this function)
/usr/src/sys/dev/pci/drm/i915_mem.c:287: warning: implicit declaration of
function 'DRM_ERR'
/usr/src/sys/dev/pci/drm/i915_mem.c:290: warning: implicit declaration of
function 'DRM_COPY_FROM_USER_IOCTL'
/usr/src/sys/dev/pci/drm/i915_mem.c:290: error: 'data' undeclared (first
use in this function)
/usr/src/sys/dev/pci/drm/i915_mem.c:303: error: 'filp' undeclared (first
use in this function)
/usr/src/sys/dev/pci/drm/i915_mem.c:303: error: too many arguments to
function 'alloc_block'
/usr/src/sys/dev/pci/drm/i915_mem.c:308: warning: implicit declaration of
function 'mark_block'
/usr/src/sys/dev/pci/drm/i915_mem.c: At top level:
/usr/src/sys/dev/pci/drm/i915_mem.c:319: warning: function declaration
isn't a prototype
/usr/src/sys/dev/pci/drm/i915_mem.c: In function 'i915_mem_free':
/usr/src/sys/dev/pci/drm/i915_mem.c:320: error: 'DRM_DEVICE' undeclared
(first use in this function)
/usr/src/sys/dev/pci/drm/i915_mem.c:321: error: 'dev' undeclared (first
use in this function)
/usr/src/sys/dev/pci/drm/i915_mem.c:330: error: 'data' undeclared (first
use in this function)
/usr/src/sys/dev/pci/drm/i915_mem.c:341: error: 'struct mem_block' has no
member named 'filp'
/usr/src/sys/dev/pci/drm/i915_mem.c:341: error: 'filp' undeclared (first
use in this function)
/usr/src/sys/dev/pci/drm/i915_mem.c: At top level:
/usr/src/sys/dev/pci/drm/i915_mem.c:350: warning: function declaration
isn't a prototype
/usr/src/sys/dev/pci/drm/i915_mem.c: In function 'i915_mem_init_heap':
/usr/src/sys/dev/pci/drm/i915_mem.c:351: error: 'DRM_DEVICE' undeclared
(first use in this function)
/usr/src/sys/dev/pci/drm/i915_mem.c:352: error: 'dev' undeclared (first
use in this function)
/usr/src/sys/dev/pci/drm/i915_mem.c:362: error: 'data' undeclared (first
use in this function)
/usr/src/sys/dev/pci/drm/i915_mem.c: At top level:
/usr/src/sys/dev/pci/drm/i915_mem.c:378: warning: function declaration
isn't a prototype
/usr/src/sys/dev/pci/drm/i915_mem.c: In function 'i915_mem_destroy_heap':
/usr/src/sys/dev/pci/drm/i915_mem.c:379: error: 'DRM_DEVICE' undeclared
(first use in this function)
/usr/src/sys/dev/pci/drm/i915_mem.c:380: error: 'dev' undeclared (first
use in this function)
/usr/src/sys/dev/pci/drm/i915_mem.c:389: error: 'data' undeclared (first
use in this function)

*** Failed target:  i915_mem.o
*** Failed command: /usr/src/../tools/bin/i386--netbsdelf-gcc -O2 -Wall
-Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wno-sign-compare
-Wno-traditional -Wa,--fatal-warnings -Werror -ffreestanding
-fno-strict-aliasing -Wno-pointer-sign -I/usr/src/common/include
-I/usr/src/sys/external/bsd/drm/dist/bsd-core
-I/usr/src/sys/external/bsd/drm/dist/shared-core -I/usr/src/common/include
-nostdinc -I. -I/usr/src/sys/modules/i915drm -isystem /usr/src/sys
-isystem /usr/src/sys/arch -isystem /usr/src/sys/../common/include
-D_KERNEL -D_LKM -D_MODULE -c /usr/src/sys/dev/pci/drm/i915_mem.c
*** Error code 1

Stop.
nbmake: stopped in /usr/src/sys/modules/i915drm

********

I looked at the include and did not see anything obvious...

Suggestions?

Thanks in advance,
gene