summaryrefslogtreecommitdiff
path: root/usr/src/uts
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/uts')
-rw-r--r--usr/src/uts/sun4u/boston/Makefile6
-rw-r--r--usr/src/uts/sun4u/boston/Makefile.boston6
-rw-r--r--usr/src/uts/sun4u/boston/Makefile.targ6
-rw-r--r--usr/src/uts/sun4u/mpxu/Makefile7
-rw-r--r--usr/src/uts/sun4u/mpxu/Makefile.mpxu.shared7
-rw-r--r--usr/src/uts/sun4u/mpxu/Makefile.targ.shared6
-rw-r--r--usr/src/uts/sun4u/opl/Makefile6
-rw-r--r--usr/src/uts/sun4u/opl/Makefile.opl.shared6
-rw-r--r--usr/src/uts/sun4u/opl/Makefile.targ.shared6
-rw-r--r--usr/src/uts/sun4u/schumacher/Makefile6
-rw-r--r--usr/src/uts/sun4u/schumacher/Makefile.schumacher6
-rw-r--r--usr/src/uts/sun4u/schumacher/Makefile.targ6
-rw-r--r--usr/src/uts/sun4u/seattle/Makefile6
-rw-r--r--usr/src/uts/sun4u/seattle/Makefile.seattle6
-rw-r--r--usr/src/uts/sun4u/seattle/Makefile.targ6
-rw-r--r--usr/src/uts/sun4u/snowbird/Makefile7
-rw-r--r--usr/src/uts/sun4u/snowbird/Makefile.snowbird5
-rw-r--r--usr/src/uts/sun4u/snowbird/Makefile.targ6
-rw-r--r--usr/src/uts/sun4v/Makefile.monza6
-rw-r--r--usr/src/uts/sun4v/montoya/Makefile.montoya7
20 files changed, 20 insertions, 103 deletions
diff --git a/usr/src/uts/sun4u/boston/Makefile b/usr/src/uts/sun4u/boston/Makefile
index ccb371db65..77a8dbdc0a 100644
--- a/usr/src/uts/sun4u/boston/Makefile
+++ b/usr/src/uts/sun4u/boston/Makefile
@@ -20,10 +20,7 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "%Z%%M% %I% %E% SMI"
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
#
# uts/sun4u/boston/Makefile
#
@@ -71,7 +68,6 @@ install: $(ROOT_BOSTON_DIR) \
$(USR_BOSTON_INC_DIR) \
$(USR_BOSTON_SBIN_PRTDIAG) \
$(USR_BOSTON_SBIN_FRUADM) \
- $(USR_BOSTON_SBIN_TRAPSTAT) \
$(USR_BOSTON_LIB_DIR) \
$(BOSTON_CRYPTO_LINKS) \
.WAIT $(BOSTON_KMODS)
diff --git a/usr/src/uts/sun4u/boston/Makefile.boston b/usr/src/uts/sun4u/boston/Makefile.boston
index d43099f1af..ab809b8a13 100644
--- a/usr/src/uts/sun4u/boston/Makefile.boston
+++ b/usr/src/uts/sun4u/boston/Makefile.boston
@@ -20,10 +20,7 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "%Z%%M% %I% %E% SMI"
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Global definitions for sun4u implementation specific modules.
#
@@ -55,7 +52,6 @@ USR_BOSTON_ISYS_DIR = $(USR_BOSTON_INC_DIR)/sys
USR_BOSTON_SBIN_DIR = $(USR_BOSTON_DIR)/sbin
USR_BOSTON_SBIN_PRTDIAG = $(USR_BOSTON_SBIN_DIR)/prtdiag
USR_BOSTON_SBIN_FRUADM = $(USR_BOSTON_SBIN_DIR)/fruadm
-USR_BOSTON_SBIN_TRAPSTAT = $(USR_BOSTON_SBIN_DIR)/trapstat
USR_BOSTON_LIB_DIR = $(USR_BOSTON_DIR)/lib
BOSTON_LINT_LIB_DIR= $(UTSBASE)/$(PLATFORM)/boston/lint-libs/$(OBJS_DIR)
diff --git a/usr/src/uts/sun4u/boston/Makefile.targ b/usr/src/uts/sun4u/boston/Makefile.targ
index be70d44a23..57b8032930 100644
--- a/usr/src/uts/sun4u/boston/Makefile.targ
+++ b/usr/src/uts/sun4u/boston/Makefile.targ
@@ -20,8 +20,7 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Common targets for sun4u implementation specific modules.
#
@@ -68,9 +67,6 @@ $(USR_BOSTON_SBIN_DIR): $(USR_BOSTON_DIR)
$(USR_BOSTON_SBIN_PRTDIAG): $(USR_BOSTON_SBIN_DIR)
$(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@
-$(USR_BOSTON_SBIN_TRAPSTAT): $(USR_BOSTON_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/trapstat $@
-
$(USR_BOSTON_SBIN_FRUADM): $(USR_BOSTON_SBIN_DIR)
$(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@
diff --git a/usr/src/uts/sun4u/mpxu/Makefile b/usr/src/uts/sun4u/mpxu/Makefile
index d444b48d0f..e7170e8e2d 100644
--- a/usr/src/uts/sun4u/mpxu/Makefile
+++ b/usr/src/uts/sun4u/mpxu/Makefile
@@ -19,11 +19,7 @@
# CDDL HEADER END
#
#
-# uts/sun4u/mpxu/Makefile
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
+# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
#
#
@@ -78,7 +74,6 @@ LINKED_PLATFORMS += SUNW,Netra-210
install: $(ROOT_MPXU_DIR) $(USR_MPXU_DIR) \
$(USR_MPXU_INC_DIR) \
$(USR_MPXU_SBIN_PRTDIAG) \
- $(USR_MPXU_SBIN_TRAPSTAT) \
$(USR_MPXU_SBIN_FRUADM) \
$(USR_MPXU_LIB_DIR) \
$(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%) \
diff --git a/usr/src/uts/sun4u/mpxu/Makefile.mpxu.shared b/usr/src/uts/sun4u/mpxu/Makefile.mpxu.shared
index 24c701e48c..4c82d112b3 100644
--- a/usr/src/uts/sun4u/mpxu/Makefile.mpxu.shared
+++ b/usr/src/uts/sun4u/mpxu/Makefile.mpxu.shared
@@ -19,11 +19,7 @@
# CDDL HEADER END
#
#
-# uts/sun4u/mpxu/Makefile.mpxu
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
#
#
@@ -57,7 +53,6 @@ USR_MPXU_INC_DIR = $(USR_MPXU_DIR)/include
USR_MPXU_ISYS_DIR = $(USR_MPXU_INC_DIR)/sys
USR_MPXU_SBIN_DIR = $(USR_MPXU_DIR)/sbin
USR_MPXU_SBIN_PRTDIAG = $(USR_MPXU_SBIN_DIR)/prtdiag
-USR_MPXU_SBIN_TRAPSTAT = $(USR_MPXU_SBIN_DIR)/trapstat
USR_MPXU_SBIN_FRUADM = $(USR_MPXU_SBIN_DIR)/fruadm
USR_MPXU_LIB_DIR = $(USR_MPXU_DIR)/lib
diff --git a/usr/src/uts/sun4u/mpxu/Makefile.targ.shared b/usr/src/uts/sun4u/mpxu/Makefile.targ.shared
index 060100d07f..281480eb08 100644
--- a/usr/src/uts/sun4u/mpxu/Makefile.targ.shared
+++ b/usr/src/uts/sun4u/mpxu/Makefile.targ.shared
@@ -19,8 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
#
#
@@ -71,9 +70,6 @@ $(USR_MPXU_SBIN_DIR): $(USR_MPXU_DIR)
$(USR_MPXU_SBIN_PRTDIAG): $(USR_MPXU_SBIN_DIR)
$(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@
-$(USR_MPXU_SBIN_TRAPSTAT): $(USR_MPXU_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/trapstat $@
-
$(USR_MPXU_SBIN_FRUADM): $(USR_MPXU_SBIN_DIR)
$(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@
diff --git a/usr/src/uts/sun4u/opl/Makefile b/usr/src/uts/sun4u/opl/Makefile
index 009f820be3..f94c5e984c 100644
--- a/usr/src/uts/sun4u/opl/Makefile
+++ b/usr/src/uts/sun4u/opl/Makefile
@@ -19,10 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "%Z%%M% %I% %E% SMI"
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
#
# This makefile drives the production of the sun4u opl platform
# module.
@@ -75,7 +72,6 @@ install: $(ROOT_OPL_DIR) $(USR_OPL_DIR) \
$(USR_OPL_INC_DIR) \
$(USR_OPL_SBIN_DIR) \
$(USR_OPL_SBIN_PRTDIAG) \
- $(USR_OPL_SBIN_TRAPSTAT) \
$(USR_OPL_SBIN_FRUADM) \
$(USR_OPL_LIB_DIR) \
$(OPL_CRYPTO_LINKS) \
diff --git a/usr/src/uts/sun4u/opl/Makefile.opl.shared b/usr/src/uts/sun4u/opl/Makefile.opl.shared
index dd3af85c37..934edae30a 100644
--- a/usr/src/uts/sun4u/opl/Makefile.opl.shared
+++ b/usr/src/uts/sun4u/opl/Makefile.opl.shared
@@ -19,10 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "%Z%%M% %I% %E% SMI"
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Global definitions for sun4u opl implementation specific modules.
#
@@ -60,7 +57,6 @@ USR_OPL_DIR = $(USR_PLAT_DIR)/SUNW,SPARC-Enterprise
USR_OPL_LIB_DIR = $(USR_OPL_DIR)/lib
USR_OPL_SBIN_DIR = $(USR_OPL_DIR)/sbin
USR_OPL_SBIN_PRTDIAG = $(USR_OPL_SBIN_DIR)/prtdiag
-USR_OPL_SBIN_TRAPSTAT = $(USR_OPL_SBIN_DIR)/trapstat
USR_OPL_SBIN_FRUADM = $(USR_OPL_SBIN_DIR)/fruadm
USR_OPL_INC_DIR = $(USR_OPL_DIR)/include
USR_OPL_ISYS_DIR = $(USR_OPL_INC_DIR)/sys
diff --git a/usr/src/uts/sun4u/opl/Makefile.targ.shared b/usr/src/uts/sun4u/opl/Makefile.targ.shared
index e85ddac84b..cb91037c13 100644
--- a/usr/src/uts/sun4u/opl/Makefile.targ.shared
+++ b/usr/src/uts/sun4u/opl/Makefile.targ.shared
@@ -19,8 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Common targets for sun4u opl implementation specific modules.
#
@@ -74,9 +73,6 @@ $(USR_OPL_SBIN_DIR): $(USR_OPL_DIR) $(USR_PSM_SBIN_DIR)
$(USR_OPL_SBIN_PRTDIAG): $(USR_OPL_SBIN_DIR)
$(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@
-$(USR_OPL_SBIN_TRAPSTAT): $(USR_OPL_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/trapstat $@
-
$(USR_OPL_SBIN_FRUADM): $(USR_OPL_SBIN_DIR)
$(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@
diff --git a/usr/src/uts/sun4u/schumacher/Makefile b/usr/src/uts/sun4u/schumacher/Makefile
index 6b5fcc772e..04df3916b3 100644
--- a/usr/src/uts/sun4u/schumacher/Makefile
+++ b/usr/src/uts/sun4u/schumacher/Makefile
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#pragma ident "%Z%%M% %I% %E% SMI"
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
#
# This makefile drives the production of the sun4u schumacher platform
# module.
@@ -67,7 +64,6 @@ install: $(ROOT_SCHUMACHER_DIR) \
$(USR_SCHUMACHER_INC_DIR) \
$(USR_SCHUMACHER_SBIN_DIR) \
$(USR_SCHUMACHER_SBIN_PRTDIAG) \
- $(USR_SCHUMACHER_SBIN_TRAPSTAT) \
$(USR_SCHUMACHER_SBIN_FRUADM) \
$(USR_SCHUMACHER_LIB_DIR) \
$(SCHUMACHER_CRYPTO_LINKS) \
diff --git a/usr/src/uts/sun4u/schumacher/Makefile.schumacher b/usr/src/uts/sun4u/schumacher/Makefile.schumacher
index b250779b6d..5eb26050a1 100644
--- a/usr/src/uts/sun4u/schumacher/Makefile.schumacher
+++ b/usr/src/uts/sun4u/schumacher/Makefile.schumacher
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#pragma ident "%Z%%M% %I% %E% SMI"
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Global definitions for sun4u implementation specific modules.
#
@@ -52,7 +49,6 @@ USR_SCHUMACHER_INC_DIR = $(USR_SCHUMACHER_DIR)/include
USR_SCHUMACHER_ISYS_DIR = $(USR_SCHUMACHER_INC_DIR)/sys
USR_SCHUMACHER_SBIN_DIR = $(USR_SCHUMACHER_DIR)/sbin
USR_SCHUMACHER_SBIN_PRTDIAG = $(USR_SCHUMACHER_SBIN_DIR)/prtdiag
-USR_SCHUMACHER_SBIN_TRAPSTAT = $(USR_SCHUMACHER_SBIN_DIR)/trapstat
USR_SCHUMACHER_SBIN_FRUADM = $(USR_SCHUMACHER_SBIN_DIR)/fruadm
USR_SCHUMACHER_LIB_DIR = $(USR_SCHUMACHER_DIR)/lib
diff --git a/usr/src/uts/sun4u/schumacher/Makefile.targ b/usr/src/uts/sun4u/schumacher/Makefile.targ
index e366b89aeb..e61bc0d213 100644
--- a/usr/src/uts/sun4u/schumacher/Makefile.targ
+++ b/usr/src/uts/sun4u/schumacher/Makefile.targ
@@ -18,8 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Common targets for sun4u implementation specific modules.
#
@@ -67,9 +66,6 @@ $(USR_SCHUMACHER_SBIN_DIR): $(USR_SCHUMACHER_DIR)
$(USR_SCHUMACHER_SBIN_PRTDIAG): $(USR_SCHUMACHER_SBIN_DIR)
$(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@
-$(USR_SCHUMACHER_SBIN_TRAPSTAT): $(USR_SCHUMACHER_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/trapstat $@
-
$(USR_SCHUMACHER_SBIN_FRUADM): $(USR_SCHUMACHER_SBIN_DIR)
$(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@
diff --git a/usr/src/uts/sun4u/seattle/Makefile b/usr/src/uts/sun4u/seattle/Makefile
index 4d8d97c7b1..5cb4516a06 100644
--- a/usr/src/uts/sun4u/seattle/Makefile
+++ b/usr/src/uts/sun4u/seattle/Makefile
@@ -20,10 +20,7 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "%Z%%M% %I% %E% SMI"
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
#
# uts/sun4u/seattle/Makefile
#
@@ -72,7 +69,6 @@ install: $(ROOT_SEATTLE_DIR) \
$(USR_SEATTLE_DIR) \
$(USR_SEATTLE_INC_DIR) \
$(USR_SEATTLE_SBIN_PRTDIAG) \
- $(USR_SEATTLE_SBIN_TRAPSTAT) \
$(USR_SEATTLE_SBIN_FRUADM) \
$(USR_SEATTLE_LIB_DIR) \
$(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%) \
diff --git a/usr/src/uts/sun4u/seattle/Makefile.seattle b/usr/src/uts/sun4u/seattle/Makefile.seattle
index b88d6b4647..e483525286 100644
--- a/usr/src/uts/sun4u/seattle/Makefile.seattle
+++ b/usr/src/uts/sun4u/seattle/Makefile.seattle
@@ -20,10 +20,7 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "%Z%%M% %I% %E% SMI"
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Global definitions for sun4u implementation specific modules.
#
@@ -54,7 +51,6 @@ USR_SEATTLE_INC_DIR = $(USR_SEATTLE_DIR)/include
USR_SEATTLE_ISYS_DIR = $(USR_SEATTLE_INC_DIR)/sys
USR_SEATTLE_SBIN_DIR = $(USR_SEATTLE_DIR)/sbin
USR_SEATTLE_SBIN_PRTDIAG = $(USR_SEATTLE_SBIN_DIR)/prtdiag
-USR_SEATTLE_SBIN_TRAPSTAT = $(USR_SEATTLE_SBIN_DIR)/trapstat
USR_SEATTLE_SBIN_FRUADM = $(USR_SEATTLE_SBIN_DIR)/fruadm
USR_SEATTLE_LIB_DIR = $(USR_SEATTLE_DIR)/lib
diff --git a/usr/src/uts/sun4u/seattle/Makefile.targ b/usr/src/uts/sun4u/seattle/Makefile.targ
index 1ba83a8c68..9a200e1f53 100644
--- a/usr/src/uts/sun4u/seattle/Makefile.targ
+++ b/usr/src/uts/sun4u/seattle/Makefile.targ
@@ -20,8 +20,7 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Common targets for sun4u implementation specific modules.
#
@@ -68,9 +67,6 @@ $(USR_SEATTLE_SBIN_DIR): $(USR_SEATTLE_DIR)
$(USR_SEATTLE_SBIN_PRTDIAG): $(USR_SEATTLE_SBIN_DIR)
$(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@
-$(USR_SEATTLE_SBIN_TRAPSTAT): $(USR_SEATTLE_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/trapstat $@
-
$(USR_SEATTLE_SBIN_FRUADM): $(USR_SEATTLE_SBIN_DIR)
$(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@
diff --git a/usr/src/uts/sun4u/snowbird/Makefile b/usr/src/uts/sun4u/snowbird/Makefile
index fe7b03ed64..48f236f240 100644
--- a/usr/src/uts/sun4u/snowbird/Makefile
+++ b/usr/src/uts/sun4u/snowbird/Makefile
@@ -19,11 +19,7 @@
# CDDL HEADER END
#
#
-# uts/sun4u/snowbird/Makefile
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
+# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
#
# This makefile drives the production of the sun4u snowbird platform
# module.
@@ -71,7 +67,6 @@ install: $(ROOT_SNOWBIRD_DIR) $(USR_SNOWBIRD_DIR) \
$(USR_SNOWBIRD_INC_DIR) \
$(USR_SNOWBIRD_SBIN_DIR) \
$(USR_SNOWBIRD_SBIN_PRTDIAG) \
- $(USR_SNOWBIRD_SBIN_TRAPSTAT) \
$(USR_SNOWBIRD_SBIN_FRUADM) \
$(USR_SNOWBIRD_LIB_DIR) \
.WAIT $(SNOWBIRD_KMODS) \
diff --git a/usr/src/uts/sun4u/snowbird/Makefile.snowbird b/usr/src/uts/sun4u/snowbird/Makefile.snowbird
index 830837e44e..961962c57f 100644
--- a/usr/src/uts/sun4u/snowbird/Makefile.snowbird
+++ b/usr/src/uts/sun4u/snowbird/Makefile.snowbird
@@ -19,10 +19,8 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "%Z%%M% %I% %E% SMI"
#
# Global definitions for sun4u snowbird implementation specific modules.
# uts/sun4u/snowbird/Makefile.snowbird
@@ -67,7 +65,6 @@ USR_SNOWBIRD_DIR = $(USR_PLAT_DIR)/SUNW,Netra-CP2300
USR_SNOWBIRD_INC_DIR = $(USR_SNOWBIRD_DIR)/include
USR_SNOWBIRD_SBIN_DIR = $(USR_SNOWBIRD_DIR)/sbin
USR_SNOWBIRD_SBIN_PRTDIAG = $(USR_SNOWBIRD_SBIN_DIR)/prtdiag
-USR_SNOWBIRD_SBIN_TRAPSTAT = $(USR_SNOWBIRD_SBIN_DIR)/trapstat
USR_SNOWBIRD_SBIN_FRUADM = $(USR_SNOWBIRD_SBIN_DIR)/fruadm
USR_SNOWBIRD_LIB_DIR = $(USR_SNOWBIRD_DIR)/lib
USR_SNOWBIRD_ISYS_DIR = $(USR_SNOWBIRD_INC_DIR)/sys
diff --git a/usr/src/uts/sun4u/snowbird/Makefile.targ b/usr/src/uts/sun4u/snowbird/Makefile.targ
index ec86663e3b..3eff14b011 100644
--- a/usr/src/uts/sun4u/snowbird/Makefile.targ
+++ b/usr/src/uts/sun4u/snowbird/Makefile.targ
@@ -19,8 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
#
# uts/sun4u/snowbird/Makefile.targ
# Common targets for sun4u snowbird implementation specific modules.
@@ -89,9 +88,6 @@ $(USR_SNOWBIRD_SBIN_DIR): $(USR_SNOWBIRD_DIR)
$(USR_SNOWBIRD_SBIN_PRTDIAG): $(USR_SNOWBIRD_SBIN_DIR)
$(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@
-$(USR_SNOWBIRD_SBIN_TRAPSTAT): $(USR_SNOWBIRD_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/trapstat $@
-
$(USR_SNOWBIRD_SBIN_FRUADM): $(USR_SNOWBIRD_SBIN_DIR)
$(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@
diff --git a/usr/src/uts/sun4v/Makefile.monza b/usr/src/uts/sun4v/Makefile.monza
index 8b51e1806d..2ec5abb5d6 100644
--- a/usr/src/uts/sun4v/Makefile.monza
+++ b/usr/src/uts/sun4v/Makefile.monza
@@ -20,10 +20,7 @@
#
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-# ident "%Z%%M% %I% %E% SMI"
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Global definitions for sun4v Monza implementation specific modules.
#
@@ -36,4 +33,3 @@ USR_SUN4V_PLAT_DIR = $(USR_PLAT_DIR)/$(PLATFORM)
USR_MONZA_DIR = $(USR_PLAT_DIR)/SUNW,Netra-CP3260
USR_MONZA_SBIN_DIR = $(USR_MONZA_DIR)/sbin
USR_MONZA_SBIN_LINKS = $(USR_MONZA_SBIN_DIR)/prtdiag
-USR_MONZA_SBIN_LINKS += $(USR_MONZA_SBIN_DIR)/trapstat
diff --git a/usr/src/uts/sun4v/montoya/Makefile.montoya b/usr/src/uts/sun4v/montoya/Makefile.montoya
index 3d31c73f65..8ecc44532e 100644
--- a/usr/src/uts/sun4v/montoya/Makefile.montoya
+++ b/usr/src/uts/sun4v/montoya/Makefile.montoya
@@ -19,11 +19,7 @@
# CDDL HEADER END
#
#
-# uts/sun4v/montoya/Makefile
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-#ident "%Z%%M% %I% %E% SMI"
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Global definitions for sun4v montoya implementation specific modules.
#
@@ -57,7 +53,6 @@ USR_MONTOYA_LIB_DIR = $(USR_MONTOYA_DIR)/lib
USR_MONTOYA_ISYS_DIR = $(USR_MONTOYA_INC_DIR)/sys
USR_MONTOYA_SBIN_LINKS = $(USR_MONTOYA_SBIN_DIR)/prtdiag
-USR_MONTOYA_SBIN_LINKS += $(USR_MONTOYA_SBIN_DIR)/trapstat
MONTOYA_LINT_LIB_DIR= $(UTSBASE)/$(PLATFORM)/montoya/lint-libs/$(OBJS_DIR)