SVN r323289 breaks i386 kernel compilation

On i386, this revision breaks compilation as follows:

Building /usr/obj/usr/src/sys/SARAH/mca.o
--- mca.o ---
/usr/src/sys/x86/x86/mca.c:985:54: error: format specifies type 
'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long 
long') [-Werror,-Wformat]
                 printf("%s: 0x%lx: !valid | !present\n", __func__, misc);
                               ~~~                                  ^~~~
                               %llx
/usr/src/sys/x86/x86/mca.c:991:43: error: format specifies type 
'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long 
long') [-Werror,-Wformat]
                 printf("%s: 0x%lx: locked\n", __func__, misc);
                               ~~~                       ^~~~
                               %llx
/usr/src/sys/x86/x86/mca.c:1000:58: error: format specifies type 
'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long 
long') [-Werror,-Wformat]
                 printf("%s: 0x%lx: count already enabled\n", __func__, 
misc);
                               ~~~                                      ^~~~
                               %llx
3 errors generated.
*** [mca.o] Error code 1