PERFORCE change 52890 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=52890

Change 52890 by peter at peter_overcee on 2004/05/16 15:28:38

	kill my fast KTR_CPU hack, I don't need it anymore.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#37 edit
.. //depot/projects/hammer/sys/kern/kern_ktr.c#9 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#37 (text+ko) ====

@@ -304,12 +304,7 @@
 lapic_id(void)
 {
 
-#if 0
 	KASSERT(lapic != NULL, ("local APIC is not mapped"));
-#else
-	if (lapic == 0)
-		return 0;
-#endif
 	return (lapic->id >> APIC_ID_SHIFT);
 }
 

==== //depot/projects/hammer/sys/kern/kern_ktr.c#9 (text+ko) ====

@@ -55,13 +55,6 @@
 #include <machine/ktr.h>
 #endif
 
-#ifdef __amd64__
-#include <sys/bus.h>
-#include <machine/intr_machdep.h>
-#include <machine/apicvar.h>
-#define  KTR_CPU lapic_id()
-#endif
-
 #include <ddb/ddb.h>
 
 #ifndef KTR_ENTRIES