buildworld failure in libkvm on amd64/RELENG_7

All,

I am unable to buildworld on RELENG_7 (amd64). It dies in libkvm with:

/usr/src/lib/libkvm/kvm_proc.c: In function 'kvm_proclist':
/usr/src/lib/libkvm/kvm_proc.c:361: warning: passing argument 1 of
'bintime2timeval' from incompatible pointer type
/usr/src/lib/libkvm/kvm_proc.c:371: error: 'struct proc' has no member
named 'p_swtime'
/usr/src/lib/libkvm/kvm_proc.c:373: error: 'struct proc' has no member
named 'p_sflag'
*** Error code 1

Stop in /usr/src/lib/libkvm.

Is this a known issue, or is it perhaps something wrong with my
system? I'm currently running 6.2-RELEASE-p7 and /usr/src was fetched
via csup on the RELENG_7 tag as of 12:00pm EDT today.

Thinking it might be something I was doing (wrong) in make.conf, I
commented that out entirely, but it still fails in libkvm.

It looks like p_swtime is defined in /usr/include/sys/proc.h, but
/usr/src/sys/sys/proc.h doesn't have either of those members. Does
libkvm need to be updated to work with the new proc in RELENG_7?

Thanks!
Josh