Did my source tree get out of sync somehow, or did pccons.c become broken with
   respect to a number of structures about two days ago and get only partially
   fixed in the most recent commit?

It should be fine now.  I made a couple of typos, and hadn't compiled
a kernel with pccons since then.