Date: Thu, 22 May 2003 23:04:38 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 31686 for review Message-ID: <200305230604.h4N64c4F018746@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305230604.h4N64c4F018746>