6.1 syspatch installed SP kernel on MP system

Have a 6.1 amd64 MP system running the generic MP kernel from the
installation. MP was automatically chosen by the installer - this is an
Intel Atom 330 dual core box.

Ran syspatch today which installed 4 new patches:

$ syspatch -l
001_dhcpd
002_vmmfpu
003_libressl
004_softraid_concat


One issue is, after installing patches with syspatch and rebooting I'm now
running the SP kernel instead of MP:

$ uname -a
OpenBSD server.localdomain 6.1 GENERIC#4 amd64

$ sysctl hw.ncpu
hw.ncpu=1


After the default installation - hw.ncpu was 2 and I was running the MP
kernel.

Looking at rollback files in /var/syspatch (see below), it looks like 2
patches updated the kernel - 002_vmmfpu and 004_softraid_concat.
Interestingly 002_vmmfpu only seems to have updated /bsd (not /bsd.mp), but
004_softraid_concat updated both.

So I *think* if I moved /bsd.mp to /bsd manually I would have a fully
patched MP kernel - since presumably the 004 kernel includes the 002
patch. Have not tried this yet.

This manual step seems like a bug. Would imagine more people have MP
machines than SP these days.

/var/syspatch$ tar ztvf ./61-002_vmmfpu/rollback.tgz
-rw-r--r-- 1 root wheel 10751939 Apr 22 05:26 ./bsd
-r--r--r-- 1 root bin 7321 Sep 4 2016
./usr/include/amd64/cpufunc.h
-r--r--r-- 1 root bin 1832 Mar 26 2015
./usr/include/amd64/fpu.h
-r--r--r-- 1 root bin 20593 Mar 23 12:58
./usr/include/amd64/vmmvar.h
-r--r--r-- 1 root bin 7321 Sep 4 2016
./usr/include/machine/cpufunc.h
-r--r--r-- 1 root bin 1832 Mar 26 2015
./usr/include/machine/fpu.h
-r--r--r-- 1 root bin 20593 Mar 23 12:58
./usr/include/machine/vmmvar.h

/var/syspatch$ tar ztvf ./61-004_softraid_concat/rollback.tgz
-rw-r--r-- 1 root wheel 10684150 May 2 19:34 ./bsd
-rw-r--r-- 1 root wheel 10756231 May 2 19:34 ./bsd.mp

$ ls -latrh /bsd*
-rw-r--r-- 1 root wheel 10.2M Apr 22 05:26 /bsd.sp
-rw-r--r-- 1 root wheel 9.0M Apr 22 05:26 /bsd.rd
-rw-r--r-- 1 root wheel 10.2M May 2 19:35 /bsd
-rw-r--r-- 1 root wheel 10.3M May 2 19:35 /bsd.mp