building kernel w/o (CPU_UCODE and COMPAT_60) fails

["K. Schreiner" <ks%ub.uni-mainz.de@localhost>]

Hi,

after the last changes to src/sys/kern/kern_cpu.c compiling
a custom kernel w/o "options CPU_UCODE" and "options COMPAT_60"
fails in kern_cpu.c:

    compile  vNBx64/kern_cpu.o
/u/NetBSD/src/sys/kern/kern_cpu.c: In function 'cpuctl_ioctl':
/u/NetBSD/src/sys/kern/kern_cpu.c:273:13: error: 'compat_cpuctl_ioctl' undeclared (first use in this function
); did you mean 'cpuctl_ioctl'?
   error = (*compat_cpuctl_ioctl)(l, cmd, data);
             ^~~~~~~~~~~~~~~~~~~
             cpuctl_ioctl
/u/NetBSD/src/sys/kern/kern_cpu.c:273:13: note: each undeclared identifier is reported only once for each fun
ction it appears in

*** Failed target:  kern_cpu.o


because compat/sys/cpuio.h, where compat_cpuctl_ioctl is declared
as: extern int (*compat_cpuctl_ioctl)(struct lwp *, u_long, void *);
isn't included in sys/sys/cpu.h:

...
#ifdef CPU_UCODE
#include <sys/cpuio.h>
#include <dev/firmload.h>
#ifdef COMPAT_60
#include <compat/sys/cpuio.h>
#endif
#endif
...

There was no problem before the change, despite "options CPU_UCODE"
and "options COMPAT_60" _not_ beeing defined, hmmm...


Kurt