Index: sys/arch/i386/isa/npx.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/isa/npx.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -r1.113 -r1.114
203a204,207
> 	if (cpu_feature & CPUID_FPU) {
> 		i386_fpu_exception = 1;
> 		return NPX_CPUID;
> 	}
Index: sys/arch/i386/isa/npxvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/isa/npxvar.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -r1.4 -r1.5
73a74
> 	NPX_CPUID
Index: sys/arch/i386/isa/npx_isa.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/isa/npx_isa.c,v
retrieving revision 1.12
retrieving revision 1.14
diff -r1.12 -r1.14
120c120
< 		ia->ia_aux = (void *)(u_long)result;
---
> 		ia->ia_aux = (void *)(intptr_t)result;
163c163,168
< 		printf(": using exception 16\n");
---
> 		/*FALLTHROUGH*/
> 	case NPX_CPUID:
> 		aprint_verbose("%s:%s using exception 16\n",
> 		    sc->sc_dev.dv_xname,
> 		    sc->sc_type == NPX_CPUID ? " reported by CPUID;" : "");
> 		sc->sc_type = NPX_EXCEPTION;
Index: sys/arch/i386/pnpbios/npx_pnpbios.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pnpbios/npx_pnpbios.c,v
retrieving revision 1.7
retrieving revision 1.9
diff -r1.7 -r1.9
85c85
< 		printf(": can't map i/o space\n");
---
> 		aprint_error(": can't map i/o space\n");
89c89,90
< 	printf("\n");
---
> 	aprint_naive("\n");
> 	aprint_normal("\n");
93c94
< 		printf("%s: unable to get IRQ number or type\n",
---
> 		aprint_error("%s: unable to get IRQ number or type\n",
102,103c103,104
< 		printf("%s: interrupting at irq %d\n", sc->sc_dev.dv_xname,
< 		    irq);
---
> 		aprint_normal("%s: interrupting at irq %d\n",
> 		    sc->sc_dev.dv_xname, irq);
109c110,115
< 		printf("%s: using exception 16\n", sc->sc_dev.dv_xname);
---
> 		/*FALLTHROUGH*/
> 	case NPX_CPUID:
> 		aprint_verbose("%s:%s using exception 16\n",
> 		    sc->sc_dev.dv_xname,
> 		    sc->sc_type == NPX_CPUID ? " reported by CPUID;" : "");
> 		sc->sc_type = NPX_EXCEPTION;
112c118
< 		printf("%s: error reporting broken; not using\n",
---
> 		aprint_error("%s: error reporting broken; not using\n",
--- sys/arch/i386/acpi/npx_acpi.c-lavaorig	2007-04-16 18:04:01.000000000 -0400
+++ sys/arch/i386/acpi/npx_acpi.c	2007-04-16 18:10:19.000000000 -0400
@@ -129,7 +129,12 @@
 		    IPL_NONE, (int (*)(void *))npxintr, NULL);
 		break;
 	case NPX_EXCEPTION:
-		printf("%s: using exception 16\n", sc->sc_dev.dv_xname);
+               /*FALLTHROUGH*/
+	case NPX_CPUID:
+		aprint_verbose("%s:%s using exception 16\n",
+			sc->sc_dev.dv_xname,
+			sc->sc_type == NPX_CPUID ? " reported by CPUID;" : "");
+		sc->sc_type = NPX_EXCEPTION;
 		break;
 	case NPX_BROKEN:
 		printf("%s: error reporting broken; not using\n",