On Sat, Jul 08, 2006 at 08:22:20PM +0000, Christos Zoulas wrote:
> 
> Module Name:	src
> Committed By:	christos
> Date:		Sat Jul  8 20:22:19 UTC 2006
> 
> Modified Files:
> 	src/sys/dev/apm: apmbios.h apmio.h
> Added Files:
> 	src/sys/dev/apm: apm.c apmvar.h files.apm
> 
> Log Message:
> Make apm an MI backend to be used by the i386 bios implementation and the
> acpi implementation. Based on work by jmcneil.
> 
> 
> To generate a diff of this commit:
> cvs rdiff -r0 -r1.3 src/sys/dev/apm/apm.c src/sys/dev/apm/apmvar.h \
>     src/sys/dev/apm/files.apm
> cvs rdiff -r1.3 -r1.4 src/sys/dev/apm/apmbios.h src/sys/dev/apm/apmio.h
> 
After this commit, I'm no longer able to build kernel including APM.
GCC4 dies with the following error: 

/w/gcc4/sys/dev/apm/apm.c: In function 'apm_power_print':
/w/gcc4/sys/dev/apm/apm.c:294: error: 'struct apm_power_info' has no member named 'remaining_valid'
/w/gcc4/sys/dev/apm/apm.c:296: error: 'struct apm_power_info' has no member named 'remaining_minutes'
/w/gcc4/sys/dev/apm/apm.c:297: error: 'struct apm_power_info' has no member named 'remaining_minutes'
/w/gcc4/sys/dev/apm/apm.c:298: error: 'struct apm_power_info' has no member named 'remaining_minutes'
/w/gcc4/sys/dev/apm/apm.c: In function 'apm_attach':
/w/gcc4/sys/dev/apm/apm.c:677: error: 'apmsc' undeclared (first use in this function)
/w/gcc4/sys/dev/apm/apm.c:677: error: (Each undeclared identifier is reported only once
/w/gcc4/sys/dev/apm/apm.c:677: error: for each function it appears in.)

If we look at the definition of 'struct apm_power_info` in apmio.h,
'remaining_valid' and 'remaining_minutes' are missing and appear only in
apm.c.

I guess it is only temporal, due to the current work on those files ?

regards,

Arnaud

ps: I checked, and my source tree looks almost synced.