Received: by mail.netbsd.org (Postfix, from userid 605) id C059F14A4B3; Sat, 22 Feb 2014 17:48:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4C65B14A4AE for ; Sat, 22 Feb 2014 17:48:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at NetBSD.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.NetBSD.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id Av1r0-nJkotI for ; Sat, 22 Feb 2014 17:48:08 +0000 (UTC) Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id 68B8514A3F2 for ; Sat, 22 Feb 2014 17:48:08 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id 51C7696; Sat, 22 Feb 2014 17:48:08 +0000 (UTC) Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" MIME-Version: 1.0 Date: Sat, 22 Feb 2014 17:48:08 +0000 From: "David Laight" Subject: CVS commit: src/sys/arch/x86 To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20140222174808.51C7696@cvs.netbsd.org> Sender: source-changes-owner@NetBSD.org List-Id: source-changes.NetBSD.org Precedence: bulk Reply-To: source-changes-d@NetBSD.org Mail-Reply-To: "David Laight" Mail-Followup-To: source-changes-d@NetBSD.org Module Name: src Committed By: dsl Date: Sat Feb 22 17:48:08 UTC 2014 Modified Files: src/sys/arch/x86/include: cpu.h src/sys/arch/x86/x86: cpu_topology.c identcpu.c Log Message: Re-use the unused ci_cpu_serial[3] to save the highest cpuid values for the normal and extended leafs. (The 'normal' one might be luring in the global cpulevel.) Read the 'extended feature' from cpuid.80000001.%ecx/edx into ci_feat_val[3/2] just after saving cpuid.1.%ecx/dx in ci_feat_val[1/0] instead of doing it separately for amd k678 and via c3 processors in their probe functions and repeating it for all cpus a few instructions later when x86_cpu_topology() is called. x86_cpu_topology() is only called from cpu_probe() and really doesn't deserve its own source file. Chasing the setup code is bad enough anyway. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/arch/x86/include/cpu.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/x86/x86/cpu_topology.c cvs rdiff -u -r1.39 -r1.40 src/sys/arch/x86/x86/identcpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.