Use <sys/ktr.h> directly in .S files instead of exporting the

KTR_* class macros via genassym.c. Together with sys/sys/ktr.h
rev. 1.34 this has the desired side-effect of providing a default
value for KTR_COMPILE. Thus this fixes warnings from -Wundef
regarding KTR_COMPILE not being defined for .S files.

Requested by:	ru
Reviewed by:	ru

2 files changed, 2 insertions, 14 deletions

diff --git a/sys/sparc64/include/ktr.h b/sys/sparc64/include/ktr.h
index e6b7f28a6a52..0b7e96a50eec 100644
--- a/sys/sparc64/include/ktr.h
+++ b/sys/sparc64/include/ktr.h
@@ -32,6 +32,8 @@
 #ifndef _MACHINE_KTR_H_
 #define _MACHINE_KTR_H_
 
+#include <sys/ktr.h>
+
 #include <machine/upa.h>
 
 #ifndef LOCORE
diff --git a/sys/sparc64/sparc64/genassym.c b/sys/sparc64/sparc64/genassym.c
index 5ef2a6fd9543..3ca7dfcd2111 100644
--- a/sys/sparc64/sparc64/genassym.c
+++ b/sys/sparc64/sparc64/genassym.c
@@ -138,20 +138,6 @@ ASSYM(IC_LINESIZE, offsetof(struct cacheinfo, ic_linesize));
 
 ASSYM(ICA_PA, offsetof(struct ipi_cache_args, ica_pa));
 
-ASSYM(KTR_PROC, KTR_PROC);
-ASSYM(KTR_TRAP, KTR_TRAP);
-ASSYM(KTR_SMP, KTR_SMP);
-ASSYM(KTR_SYSC, KTR_SYSC);
-ASSYM(KTR_INTR, KTR_INTR);
-ASSYM(KTR_CT1, KTR_CT1);
-ASSYM(KTR_CT2, KTR_CT2);
-ASSYM(KTR_CT3, KTR_CT3);
-ASSYM(KTR_CT4, KTR_CT4);
-ASSYM(KTR_CT5, KTR_CT5);
-ASSYM(KTR_CT6, KTR_CT6);
-ASSYM(KTR_CT7, KTR_CT7);
-ASSYM(KTR_CT8, KTR_CT8);
-
 ASSYM(KTR_SIZEOF, sizeof(struct ktr_entry));
 ASSYM(KTR_LINE, offsetof(struct ktr_entry, ktr_line));
 ASSYM(KTR_FILE, offsetof(struct ktr_entry, ktr_file));