6.1 to 6.2 freebsd-update binary upgrade on amd64

[Jim Howard]

I've used the 6.0 to 6.1/6.1 to 6.2 upgrade scripts on several i386
machines (from here:
http://www.daemonology.net/blog/2006-11-26-freebsd-6.1-to-6.2-binary-upgrade.html)
and it has worked flawlessly- and so easy!

Today I updated a new amd64 server from 6.1 to 6.2 and after the process
completed, I noticed that I ended up with a GENERIC kernel instead of
SMP like I had before.  Since I've done the upgrade process several
times before on other machines, I was a little on autopilot, but I
believe the upgrade script did recognized I had kernel/smp component
installed.

I checked the stable archives and didn't see anything similar to my
problem.  Is there a step I missed, or did the upgrade script not
correctly recognize my SMP AMD?  Are there any additional logs from the
freebsd-update script I should provide?

If I were to roll back the update with freebsd-update, would I have do
to it twice- once for the userland updates and once for the kernel?

Here's the first part of the log for the SMP 6.1 kernel:
Feb  4 10:20:23 server syslogd: kernel boot file is /boot/kernel/kernel
Feb  4 10:20:23 server kernel: Copyright (c) 1992-2006 The FreeBSD Project.
Feb  4 10:20:23 server kernel: Copyright (c) 1979, 1980, 1983, 1986,
1988, 1989, 1991, 1992, 1993, 1994
Feb  4 10:20:23 server kernel: The Regents of the University of
California. All rights reserved.
Feb  4 10:20:23 server kernel: FreeBSD 6.1-RELEASE #0: Sun May  7
04:15:57 UTC 2006
Feb  4 10:20:23 server kernel:
root at bloom.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP
Feb  4 10:20:23 server kernel: ACPI APIC Table: <A M I  OEMAPIC >
Feb  4 10:20:23 server kernel: Timecounter "i8254" frequency 1193182 Hz
quality 0
Feb  4 10:20:23 server kernel: CPU: AMD Opteron(tm) Processor 246
(2004.56-MHz K8-class CPU)
Feb  4 10:20:23 server kernel: Origin = "AuthenticAMD"  Id = 0x20f51 
Stepping = 1
Feb  4 10:20:23 server kernel:
Features=0x78bfbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE
36,CLFLUSH,MMX,FXSR,SSE,SSE2>
Feb  4 10:20:23 server kernel: Features2=0x1<SSE3>
Feb  4 10:20:23 server kernel: AMD
Features=0xe2500800<SYSCALL,NX,MMX+,FFXSR,LM,3DNow+,3DNow>
Feb  4 10:20:23 server kernel: AMD Features2=0x1<LAHF>
Feb  4 10:20:23 server kernel: real memory  = 5368709120 (5120 MB)
Feb  4 10:20:23 server kernel: avail memory = 4115480576 (3924 MB)
Feb  4 10:20:23 server kernel: FreeBSD/SMP: Multiprocessor System
Detected: 2 CPUs
Feb  4 10:20:23 server kernel: cpu0 (BSP): APIC ID:  0
Feb  4 10:20:23 server kernel: cpu1 (AP): APIC ID:  1

And after doing the upgrade process:
Feb  4 10:45:47 server syslogd: kernel boot file is /boot/kernel/kernel
Feb  4 10:45:47 server kernel: Copyright (c) 1992-2007 The FreeBSD Project.
Feb  4 10:45:47 server kernel: Copyright (c) 1979, 1980, 1983, 1986,
1988, 1989, 1991, 1992, 1993, 1994
Feb  4 10:45:47 server kernel: The Regents of the University of
California. All rights reserved.
Feb  4 10:45:47 server kernel: FreeBSD is a registered trademark of The
FreeBSD Foundation.
Feb  4 10:45:47 server kernel: FreeBSD 6.2-RELEASE #0: Fri Jan 12
08:32:24 UTC 2007
Feb  4 10:45:47 server kernel:
root at portnoy.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC
Feb  4 10:45:47 server kernel: Timecounter "i8254" frequency 1193182 Hz
quality 0
Feb  4 10:45:47 server kernel: CPU: AMD Opteron(tm) Processor 246
(2004.56-MHz K8-class CPU)
Feb  4 10:45:47 server kernel: Origin = "AuthenticAMD"  Id = 0x20f51 
Stepping = 1
Feb  4 10:45:47 server kernel:
Features=0x78bfbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE
36,CLFLUSH,MMX,FXSR,SSE,SSE2>
Feb  4 10:45:47 server kernel: Features2=0x1<SSE3>
Feb  4 10:45:47 server kernel: AMD
Features=0xe2500800<SYSCALL,NX,MMX+,FFXSR,LM,3DNow+,3DNow>
Feb  4 10:45:47 server kernel: AMD Features2=0x1<LAHF>
Feb  4 10:45:47 server kernel: real memory  = 5368709120 (5120 MB)
Feb  4 10:45:47 server kernel: avail memory = 4115161088 (3924 MB)

Thanks,
-Jim