freebsd stable - Jun 2009 - Cannot buildkernel i386/p3 (i915_suspend.c)

Hello.

I'm trying to update P3 STABLE box from 7.2-PRERELEASE to 
latest stable source.

8< cut 8<

/usr/src/sys/modules/drm/i915/../../../dev/drm/i915_suspend.c: 
In function 'i915_save_state':
/usr/src/sys/modules/drm/i915/../../../dev/drm/i915_suspend.c:244: 
error: 'struct drm_i915_private' has no member named
'saveRENDERSTANDBY'
/usr/src/sys/modules/drm/i915/../../../dev/drm/i915_suspend.c:247: 
error: 'struct drm_i915_private' has no member named 'saveHWS'
/usr/src/sys/modules/drm/i915/../../../dev/drm/i915_suspend.c: 
In function 'i915_restore_state':
/usr/src/sys/modules/drm/i915/../../../dev/drm/i915_suspend.c:380: 
error: 'struct drm_i915_private' has no member named
'saveRENDERSTANDBY'
/usr/src/sys/modules/drm/i915/../../../dev/drm/i915_suspend.c:383: 
error: 'struct drm_i915_private' has no member named 'saveHWS'
*** Error code 1
1 error

I even deleted whole source and recsuped. 

My local i915_suspend.c is the same as in STABLE and CURRENT. 

There are no such problems on my CURRENT amd64 box.

How do I update:

make cleandir && make cleandir && rm -rf /usr/obj && 
make -j3 buildworld && make -j3 buildkernel KERNCONF=I686STRIPPED
&&
 make installkernel KERNCONF=I686STRIPPED && make installworld
&&
 make -DBATCH_DELETE_OLD_FILES delete-old-libs && 
make -DBATCH_DELETE_OLD_FILES delete-old && 
make cleandir && make cleandir && rm -rf /usr/obj &&
 mergemaster

Am I missing something obvious?

-best regards, 
Jakub Lach 
-- 
View this message in context:
http://www.nabble.com/Cannot-buildkernel-i386-p3-%28i915_suspend.c%29-tp24219991p24219991.html
Sent from the freebsd-stable mailing list archive at Nabble.com.

On Fri, 2009-06-26 at 06:09 -0700, Jakub Lach wrote:
> Hello.
> 
> I'm trying to update P3 STABLE box from 7.2-PRERELEASE to 
> latest stable source.
> 
> 8< cut 8<
> 
> /usr/src/sys/modules/drm/i915/../../../dev/drm/i915_suspend.c: 
> In function 'i915_save_state':
> /usr/src/sys/modules/drm/i915/../../../dev/drm/i915_suspend.c:244: 
> error: 'struct drm_i915_private' has no member named
'saveRENDERSTANDBY'
> /usr/src/sys/modules/drm/i915/../../../dev/drm/i915_suspend.c:247: 
> error: 'struct drm_i915_private' has no member named
'saveHWS'
> /usr/src/sys/modules/drm/i915/../../../dev/drm/i915_suspend.c: 
> In function 'i915_restore_state':
> /usr/src/sys/modules/drm/i915/../../../dev/drm/i915_suspend.c:380: 
> error: 'struct drm_i915_private' has no member named
'saveRENDERSTANDBY'
> /usr/src/sys/modules/drm/i915/../../../dev/drm/i915_suspend.c:383: 
> error: 'struct drm_i915_private' has no member named
'saveHWS'
> *** Error code 1
> 1 error
> 
> I even deleted whole source and recsuped. 
> 
> My local i915_suspend.c is the same as in STABLE and CURRENT. 
> 
> There are no such problems on my CURRENT amd64 box.
These come from i915_drv.h.  I just did a test build on stable/7 i386
and didn't have any issue.
>>> Kernel build for GENERIC completed on Fri Jun 26 15:59:24 UTC 2009
robert.
> How do I update:
> 
> make cleandir && make cleandir && rm -rf /usr/obj
&&
> make -j3 buildworld && make -j3 buildkernel KERNCONF=I686STRIPPED
&&
>  make installkernel KERNCONF=I686STRIPPED && make installworld
&&
>  make -DBATCH_DELETE_OLD_FILES delete-old-libs && 
> make -DBATCH_DELETE_OLD_FILES delete-old && 
> make cleandir && make cleandir && rm -rf /usr/obj
&&
>  mergemaster
> 
> Am I missing something obvious?
> 
> -best regards, 
> Jakub Lach 
-- 
Robert Noland <rnoland@FreeBSD.org>
FreeBSD
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: This is a digitally signed message part
Url :
http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20090626/1656db5a/attachment.pgp