6968165 ::ioapic and ::apic should be limited to kmdb

6968169 missing start dates in some interrupt related files

15 files changed, 20 insertions, 13 deletions

diff --git a/usr/src/cmd/intrd/intrd.pl b/usr/src/cmd/intrd/intrd.pl
index 78276e34b3..cf68d5a9c9 100644
--- a/usr/src/cmd/intrd/intrd.pl
+++ b/usr/src/cmd/intrd/intrd.pl
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 require 5.8.4;
diff --git a/usr/src/cmd/mdb/i86pc/modules/Makefile b/usr/src/cmd/mdb/i86pc/modules/Makefile
index 675a70b2a4..ff08f9c665 100644
--- a/usr/src/cmd/mdb/i86pc/modules/Makefile
+++ b/usr/src/cmd/mdb/i86pc/modules/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 SUBDIRS = \
 	apix \
diff --git a/usr/src/cmd/mdb/i86pc/modules/apix/apix.c b/usr/src/cmd/mdb/i86pc/modules/apix/apix.c
index f17f6dacb3..62ede1fd26 100644
--- a/usr/src/cmd/mdb/i86pc/modules/apix/apix.c
+++ b/usr/src/cmd/mdb/i86pc/modules/apix/apix.c
@@ -152,8 +152,10 @@ static const mdb_dcmd_t dcmds[] = {
 	    interrupt_help},
 	{ "softint", "?[-d]", "print soft interrupts", soft_interrupt_dump,
 	    soft_interrupt_help},
+#ifdef _KMDB
 	{ "apic", NULL, "print apic register contents", apic },
 	{ "ioapic", NULL, "print ioapic register contents", ioapic },
+#endif /* _KMDB */
 	{ NULL }
 };
 
diff --git a/usr/src/cmd/mdb/i86pc/modules/common/apic_common.c b/usr/src/cmd/mdb/i86pc/modules/common/apic_common.c
index e4db9b61a5..3ca58c7592 100644
--- a/usr/src/cmd/mdb/i86pc/modules/common/apic_common.c
+++ b/usr/src/cmd/mdb/i86pc/modules/common/apic_common.c
@@ -24,6 +24,7 @@
 
 #include "intr_common.h"
 
+#ifdef _KMDB
 
 /* Macros for reading/writing the IOAPIC RDT entries */
 #define	APIC_READ_IOAPIC_RDT_ENTRY_LOW_DWORD(ioapic_ix, ipin) \
@@ -139,3 +140,5 @@ apic(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
 
 	return (DCMD_OK);
 }
+
+#endif /* _KMDB */
diff --git a/usr/src/cmd/mdb/i86pc/modules/common/intr_common.c b/usr/src/cmd/mdb/i86pc/modules/common/intr_common.c
index 691f0c4064..00f6afcbf8 100644
--- a/usr/src/cmd/mdb/i86pc/modules/common/intr_common.c
+++ b/usr/src/cmd/mdb/i86pc/modules/common/intr_common.c
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #include "intr_common.h"
diff --git a/usr/src/cmd/mdb/i86pc/modules/common/intr_common.h b/usr/src/cmd/mdb/i86pc/modules/common/intr_common.h
index c3f187f777..d2d92594ba 100644
--- a/usr/src/cmd/mdb/i86pc/modules/common/intr_common.h
+++ b/usr/src/cmd/mdb/i86pc/modules/common/intr_common.h
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #ifndef _MDB_INTR_COMMON_H
diff --git a/usr/src/cmd/mdb/i86pc/modules/pcplusmp/amd64/Makefile b/usr/src/cmd/mdb/i86pc/modules/pcplusmp/amd64/Makefile
index 04542d0fe1..ba3f361c2f 100644
--- a/usr/src/cmd/mdb/i86pc/modules/pcplusmp/amd64/Makefile
+++ b/usr/src/cmd/mdb/i86pc/modules/pcplusmp/amd64/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 MODULE = pcplusmp.so
diff --git a/usr/src/cmd/mdb/i86pc/modules/pcplusmp/ia32/Makefile b/usr/src/cmd/mdb/i86pc/modules/pcplusmp/ia32/Makefile
index 46899c52a1..c2bd1f6d91 100644
--- a/usr/src/cmd/mdb/i86pc/modules/pcplusmp/ia32/Makefile
+++ b/usr/src/cmd/mdb/i86pc/modules/pcplusmp/ia32/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 MODULE = pcplusmp.so
diff --git a/usr/src/cmd/mdb/i86pc/modules/pcplusmp/pcplusmp.c b/usr/src/cmd/mdb/i86pc/modules/pcplusmp/pcplusmp.c
index f5b3af0027..9dbf703afd 100644
--- a/usr/src/cmd/mdb/i86pc/modules/pcplusmp/pcplusmp.c
+++ b/usr/src/cmd/mdb/i86pc/modules/pcplusmp/pcplusmp.c
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #include "intr_common.h"
@@ -97,8 +97,10 @@ static const mdb_dcmd_t dcmds[] = {
 	    interrupt_help},
 	{ "softint", "?[-d]", "print soft interrupts", soft_interrupt_dump,
 	    soft_interrupt_help},
+#ifdef _KMDB
 	{ "apic", NULL, "print apic register contents", apic },
 	{ "ioapic", NULL, "print ioapic register contents", ioapic },
+#endif /* _KMDB */
 	{ NULL }
 };
 
diff --git a/usr/src/cmd/mdb/i86pc/modules/unix/unix.c b/usr/src/cmd/mdb/i86pc/modules/unix/unix.c
index f73594ef22..d774cde91f 100644
--- a/usr/src/cmd/mdb/i86pc/modules/unix/unix.c
+++ b/usr/src/cmd/mdb/i86pc/modules/unix/unix.c
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #include <mdb/mdb_modapi.h>
diff --git a/usr/src/cmd/mdb/i86pc/modules/uppc/uppc.c b/usr/src/cmd/mdb/i86pc/modules/uppc/uppc.c
index c198d257d3..d3ebde66b3 100644
--- a/usr/src/cmd/mdb/i86pc/modules/uppc/uppc.c
+++ b/usr/src/cmd/mdb/i86pc/modules/uppc/uppc.c
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #include "intr_common.h"
diff --git a/usr/src/cmd/pcitool/pcitool_ui.c b/usr/src/cmd/pcitool/pcitool_ui.c
index 4a44c528a9..d47fe7fefa 100644
--- a/usr/src/cmd/pcitool/pcitool_ui.c
+++ b/usr/src/cmd/pcitool/pcitool_ui.c
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*
diff --git a/usr/src/cmd/pcitool/pcitool_ui.h b/usr/src/cmd/pcitool/pcitool_ui.h
index b916d47b09..65ef6ffc96 100644
--- a/usr/src/cmd/pcitool/pcitool_ui.h
+++ b/usr/src/cmd/pcitool/pcitool_ui.h
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #ifndef	_PCITOOL_UI_H
diff --git a/usr/src/cmd/pcitool/pcitool_usage.c b/usr/src/cmd/pcitool/pcitool_usage.c
index 1781d973ce..6e7c73b7b2 100644
--- a/usr/src/cmd/pcitool/pcitool_usage.c
+++ b/usr/src/cmd/pcitool/pcitool_usage.c
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #ifndef	_PCITOOL_USAGE_TEXT_H
diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Intrs/Intrs.pm b/usr/src/cmd/perl/contrib/Sun/Solaris/Intrs/Intrs.pm
index b406bd386a..e2b707dc78 100644
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Intrs/Intrs.pm
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Intrs/Intrs.pm
@@ -18,7 +18,7 @@
 # CDDL HEADER END
 
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # Intrs.pm provides the bootstrap for the private Sun::Solaris::Intrs module.
 #