6217259 A sun4u specific kmech_krb5 is unnecessary

--HG--
rename : usr/src/uts/sun4u/kmech_krb5/Makefile => deleted_files/usr/src/uts/sun4u/kmech_krb5/Makefile
rename : usr/src/uts/sun4u/kmech_krb5/inc.flg => deleted_files/usr/src/uts/sun4u/kmech_krb5/inc.flg
rename : usr/src/uts/sun4u/kmech_krb5/req.flg => deleted_files/usr/src/uts/sun4u/kmech_krb5/req.flg

7 files changed, 1 insertions, 30 deletions

diff --git a/usr/src/uts/sun4u/kmech_krb5/Makefile b/deleted_files/usr/src/uts/sun4u/kmech_krb5/Makefile
index a7fd6f3d4b..a7fd6f3d4b 100644
--- a/usr/src/uts/sun4u/kmech_krb5/Makefile
+++ b/deleted_files/usr/src/uts/sun4u/kmech_krb5/Makefile
diff --git a/usr/src/uts/sun4u/kmech_krb5/inc.flg b/deleted_files/usr/src/uts/sun4u/kmech_krb5/inc.flg
index b79896d59c..b79896d59c 100644
--- a/usr/src/uts/sun4u/kmech_krb5/inc.flg
+++ b/deleted_files/usr/src/uts/sun4u/kmech_krb5/inc.flg
diff --git a/usr/src/uts/sun4u/kmech_krb5/req.flg b/deleted_files/usr/src/uts/sun4u/kmech_krb5/req.flg
index f8e8b042e3..f8e8b042e3 100644
--- a/usr/src/uts/sun4u/kmech_krb5/req.flg
+++ b/deleted_files/usr/src/uts/sun4u/kmech_krb5/req.flg
diff --git a/usr/src/pkgdefs/SUNWcakr.u/prototype_com b/usr/src/pkgdefs/SUNWcakr.u/prototype_com
index 2187795a5b..50ac9edc49 100644
--- a/usr/src/pkgdefs/SUNWcakr.u/prototype_com
+++ b/usr/src/pkgdefs/SUNWcakr.u/prototype_com
@@ -485,9 +485,6 @@ f none platform/sun4u/kernel/drv/sparcv9/zsh 755 root sys
 f none platform/sun4u/kernel/drv/trapstat.conf 644 root sys
 f none platform/sun4u/kernel/drv/zsh.conf 644 root sys
 d none platform/sun4u/kernel/misc 755 root sys
-d none platform/sun4u/kernel/misc/kgss 755 root sys
-d none platform/sun4u/kernel/misc/kgss/sparcv9 755 root sys
-f none platform/sun4u/kernel/misc/kgss/sparcv9/kmech_krb5 755 root sys
 d none platform/sun4u/kernel/misc/sparcv9 755 root sys
 f none platform/sun4u/kernel/misc/sparcv9/kmdbmod 755 root sys
 f none platform/sun4u/kernel/misc/sparcv9/bootdev 755 root sys
diff --git a/usr/src/uts/common/gssapi/mechs/krb5/krb5mech.c b/usr/src/uts/common/gssapi/mechs/krb5/krb5mech.c
index c0d828c3d9..7d82c28788 100644
--- a/usr/src/uts/common/gssapi/mechs/krb5/krb5mech.c
+++ b/usr/src/uts/common/gssapi/mechs/krb5/krb5mech.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  * A module for Kerberos V5  security mechanism.
@@ -68,20 +68,10 @@ static gss_mechanism
  */
 extern struct mod_ops mod_miscops;
 
-#if defined(sun4u)
-
-static struct modlmisc modlmisc = {
-	&mod_miscops, "Krb5 GSS mech, sun4u optimized"
-};
-
-#else
-
 static struct modlmisc modlmisc = {
 	&mod_miscops, "Krb5 GSS mechanism"
 };
 
-#endif
-
 static struct modlinkage modlinkage = {
 	MODREV_1,
 	(void *)&modlmisc,
diff --git a/usr/src/uts/sun4u/Makefile.rules b/usr/src/uts/sun4u/Makefile.rules
index 3bffe56e51..5a81ff988d 100644
--- a/usr/src/uts/sun4u/Makefile.rules
+++ b/usr/src/uts/sun4u/Makefile.rules
@@ -168,15 +168,6 @@ $(OBJS_DIR)/%.o:		$(UTSBASE)/sun4u/rsa/%.s
 $(OBJS_DIR)/%.o:		$(SRC)/common/atomic/sparcv9/%.s
 	$(COMPILE.s) -o $@ $<
 
-KMECHKRB5_BASE=$(UTSBASE)/common/gssapi/mechs/krb5
-
-$(OBJS_DIR)/%.o:		$(KMECHKRB5_BASE)/crypto/des/sparc/sun4u/%.c
-	$(COMPILE.c) -o $@ $<
-	$(CTFCONVERT_O)
-
-$(OBJS_DIR)/%.o:		$(KMECHKRB5_BASE)/crypto/des/sparc/sun4u/%.s
-	$(COMPILE.s) -o $@ $<
-
 $(OBJS_DIR)/dtracestubs.s:	$(UNIX_O) $(LIBS)
 	nm -u $(UNIX_O) $(LIBS) | grep __dtrace_probe_ | sort | uniq | nawk '{ \
 	    printf("\t.global %s\n\t.type %s, #function\n%s:\n", \
@@ -287,11 +278,5 @@ $(LINTS_DIR)/%.ln:		$(SRC)/common/crypto/sha1/sparc/sun4u/%.s
 $(LINTS_DIR)/%.ln:		$(UTSBASE)/sun4u/rsa/%.s
 	@($(LHEAD) $(LINT.s) $< $(LTAIL))
 
-$(LINTS_DIR)/%.ln:		$(KMECHKRB5_BASE)/crypto/des/sparc/sun4u/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(KMECHKRB5_BASE)/crypto/des/sparc/sun4u/%.s
-	@($(LHEAD) $(LINT.s) $< $(LTAIL))
-
 $(LINTS_DIR)/%.ln:		$(SRC)/common/atomic/%.c
 	@($(LHEAD) $(LINT.c) $< $(LTAIL))
diff --git a/usr/src/uts/sun4u/Makefile.sun4u.shared b/usr/src/uts/sun4u/Makefile.sun4u.shared
index 618b59d3d2..51c6efc89f 100644
--- a/usr/src/uts/sun4u/Makefile.sun4u.shared
+++ b/usr/src/uts/sun4u/Makefile.sun4u.shared
@@ -446,7 +446,6 @@ MISC_KMODS	+= obpsym bootdev vis cpr platmod md5 sha1 i2c_svc
 MISC_KMODS	+= sbd
 
 MISC_KMODS	+= opl_cfg
-MISC_KMODS	+= kmech_krb5
 MISC_KMODS	+= zuluvm
 MISC_KMODS	+= gptwo_cpu gptwocfg