From owner-p4-projects@FreeBSD.ORG  Thu May 22 23:04:39 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 442E937B404; Thu, 22 May 2003 23:04:39 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CEF5F37B401
	for <perforce@freebsd.org>; Thu, 22 May 2003 23:04:38 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7703E43F3F
	for <perforce@freebsd.org>; Thu, 22 May 2003 23:04:38 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4N64c0U018749
	for <perforce@freebsd.org>; Thu, 22 May 2003 23:04:38 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N64c4F018746
	for perforce@freebsd.org; Thu, 22 May 2003 23:04:38 -0700 (PDT)
Date: Thu, 22 May 2003 23:04:38 -0700 (PDT)
Message-Id: <200305230604.h4N64c4F018746@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 31686 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 May 2003 06:04:40 -0000

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

Change 31686 by peter@peter_overcee on 2003/05/22 23:04:01

	This was rather bogus.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#9 edit
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#13 edit
.. //depot/projects/hammer/sys/conf/options.amd64#11 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#9 (text+ko) ====

@@ -98,6 +98,7 @@
 	char *brand;
 
 	cpu_class = amd64_cpus[cpu].cpu_class;
+	printf("CPU: ");
 	strncpy(cpu_model, amd64_cpus[cpu].cpu_name, sizeof (cpu_model));
 
 	/* Check for extended CPUID information and a processor name. */
@@ -148,10 +149,6 @@
 	if (*brand != '\0')
 		strcpy(cpu_model, brand);
 
-#ifdef NDA
-	printf("CPU: %s AMD64 Class Processor\n", cpu_vendor);
-#else
-	printf("CPU: ");
 	printf("%s (", cpu_model);
 	switch(cpu_class) {
 	case CPUCLASS_K8:
@@ -165,7 +162,6 @@
 		printf("Unknown");	/* will panic below... */
 	}
 	printf("-class CPU)\n");
-#endif
 	if(*cpu_vendor)
 		printf("  Origin = \"%s\"",cpu_vendor);
 	if(cpu_id)

==== //depot/projects/hammer/sys/amd64/conf/GENERIC#13 (text+ko) ====

@@ -22,7 +22,6 @@
 cpu		HAMMER
 ident		GENERIC
 maxusers	0
-options		NDA			#Avoid accidental cut/paste of NDA'ed stuff
 options 	IA32
 options 	COMPAT_FREEBSD4
 

==== //depot/projects/hammer/sys/conf/options.amd64#11 (text+ko) ====

@@ -54,7 +54,6 @@
 # EOF
 # -------------------------------
 HAMMER			opt_cpu.h
-NDA			opt_cpu.h
 PPC_PROBE_CHIPSET	opt_ppc.h
 PPC_DEBUG		opt_ppc.h
 PSM_HOOKRESUME		opt_psm.h