From owner-svn-src-stable-10@freebsd.org Tue Aug 15 03:20:59 2017 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EBDBADD968A; Tue, 15 Aug 2017 03:20:59 +0000 (UTC) (envelope-from sepherosa@gmail.com) Received: from mail-pg0-x236.google.com (mail-pg0-x236.google.com [IPv6:2607:f8b0:400e:c05::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C399C7FF44; Tue, 15 Aug 2017 03:20:59 +0000 (UTC) (envelope-from sepherosa@gmail.com) Received: by mail-pg0-x236.google.com with SMTP id y129so59373940pgy.4; Mon, 14 Aug 2017 20:20:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=zHkZFHJmGo+esicOM/HBGt2HlLczuE5XYr35q9wRMVE=; b=q4H2wm+ZK0lWEIwzfmF5Zgdq1YZb7ZExQvZyV1PQ8B8D1h1Gsk/5LwKs8ku2CHpqXs zbWFgyoyPjkQN9056aknuIAr8JmOtrnVnb+FSLtAj9D6flLH7rU2aUapCKvNlUfYNTQo 1btJC5IkPiBTGIuEi5aACtFyFxjaJwOnpTQSq62wFJoPAlz3lhpvZnNqQVyMdgZm5/ij KF/B2XgKc25H9YCniNeGnZdw/nPAtCYgMGwF0XdhHErUaIoX1ccZYYqwnqiWvOEDOCE3 VqNtarLr0QXlDBEGrJJfPi3zL7TdE8tvmmDDkwbjCnJvBlpTJbMfrsQTDfSYYLPEPODT FodQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=zHkZFHJmGo+esicOM/HBGt2HlLczuE5XYr35q9wRMVE=; b=KSFXAZHEHsfBYNpI+P74dnK7wLyrNKAvwcLaLB9cESR1BaxNJECRXmAqbG1LLBF5Zo aPQDgaGdGAMf4Li0O5JrXdpu6rfOEhcgrwpW4WZEZ2NZSo1qkNiL1bV7UynOV8dEc08J 159URPq3exCA5XmZEtakmHTzb5j5Msf59t2tHM8LQuHlBxRi0dnW8Tnjze9u8829NyLi TZE3GOacSY1MN2FCpZixaw6i//VmqbWh7nI4OuopAzo1XpvD3oQJwqBQ1awbbtqvcc6I 4GtXePYy7RGT37Flk1MY5EAfFRObml55HE6gu+jxCi0AKaaXFQXx8Cm69xyQc6zAV/ON HOng== X-Gm-Message-State: AHYfb5hkzlDI6AW7xgeIplfQxAHSxQS5dwW9SNLBVR8Vk/NXUb9gZMRR Gpb9QZL7fdx9oy0gVs3zqzCOJ4c6Qg== X-Received: by 10.84.231.2 with SMTP id f2mr30586467plk.253.1502767259155; Mon, 14 Aug 2017 20:20:59 -0700 (PDT) MIME-Version: 1.0 Received: by 10.100.128.28 with HTTP; Mon, 14 Aug 2017 20:20:58 -0700 (PDT) In-Reply-To: <201708142346.v7ENkACH028018@repo.freebsd.org> References: <201708142346.v7ENkACH028018@repo.freebsd.org> From: Sepherosa Ziehau Date: Tue, 15 Aug 2017 11:20:58 +0800 Message-ID: Subject: Re: svn commit: r322523 - in stable/10/sys: amd64/amd64 amd64/include x86/x86 To: Jung-uk Kim Cc: src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2017 03:21:00 -0000 Thank you! On Tue, Aug 15, 2017 at 7:46 AM, Jung-uk Kim wrote: > Author: jkim > Date: Mon Aug 14 23:46:10 2017 > New Revision: 322523 > URL: https://svnweb.freebsd.org/changeset/base/322523 > > Log: > MFC: r322323 > > Split identify_cpu() into two functions for amd64 as we do for i386. This > fixes a regression introduced in r322205. > > Approved by: re (marius) > > Modified: > stable/10/sys/amd64/amd64/machdep.c > stable/10/sys/amd64/include/md_var.h > stable/10/sys/x86/x86/identcpu.c > Directory Properties: > stable/10/ (props changed) > > Modified: stable/10/sys/amd64/amd64/machdep.c > ============================================================================== > --- stable/10/sys/amd64/amd64/machdep.c Mon Aug 14 22:38:54 2017 (r322522) > +++ stable/10/sys/amd64/amd64/machdep.c Mon Aug 14 23:46:10 2017 (r322523) > @@ -1853,6 +1853,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) > ksym_end = MD_FETCH(kmdp, MODINFOMD_ESYM, uintptr_t); > #endif > > + identify_cpu(); > identify_hypervisor(); > > /* Init basic tunables, hz etc */ > @@ -1950,7 +1951,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) > MODINFO_METADATA | MODINFOMD_EFI_MAP) != NULL) > vty_set_preferred(VTY_VT); > > - identify_cpu(); /* Final stage of CPU initialization */ > + finishidentcpu(); /* Final stage of CPU initialization */ > initializecpu(); /* Initialize CPU registers */ > initializecpucache(); > > > Modified: stable/10/sys/amd64/include/md_var.h > ============================================================================== > --- stable/10/sys/amd64/include/md_var.h Mon Aug 14 22:38:54 2017 (r322522) > +++ stable/10/sys/amd64/include/md_var.h Mon Aug 14 23:46:10 2017 (r322523) > @@ -119,6 +119,7 @@ void fsbase_load_fault(void) __asm(__STRING(fsbase_loa > void gsbase_load_fault(void) __asm(__STRING(gsbase_load_fault)); > void dump_add_page(vm_paddr_t); > void dump_drop_page(vm_paddr_t); > +void finishidentcpu(void); > void identify_cpu(void); > void identify_hypervisor(void); > void initializecpu(void); > > Modified: stable/10/sys/x86/x86/identcpu.c > ============================================================================== > --- stable/10/sys/x86/x86/identcpu.c Mon Aug 14 22:38:54 2017 (r322522) > +++ stable/10/sys/x86/x86/identcpu.c Mon Aug 14 23:46:10 2017 (r322523) > @@ -1346,23 +1346,12 @@ fix_cpuid(void) > return (false); > } > > -/* > - * Final stage of CPU identification. > - */ > -#ifdef __i386__ > +#ifdef __amd64__ > void > -finishidentcpu(void) > -#else > -void > identify_cpu(void) > -#endif > { > - u_int regs[4], cpu_stdext_disable; > -#ifdef __i386__ > - u_char ccr3; > -#endif > + u_int regs[4]; > > -#ifdef __amd64__ > do_cpuid(0, regs); > cpu_high = regs[0]; > ((u_int *)&cpu_vendor)[0] = regs[1]; > @@ -1375,6 +1364,18 @@ identify_cpu(void) > cpu_procinfo = regs[1]; > cpu_feature = regs[3]; > cpu_feature2 = regs[2]; > +} > +#endif > + > +/* > + * Final stage of CPU identification. > + */ > +void > +finishidentcpu(void) > +{ > + u_int regs[4], cpu_stdext_disable; > +#ifdef __i386__ > + u_char ccr3; > #endif > > cpu_vendor_id = find_cpu_vendor_id(); > _______________________________________________ > svn-src-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" -- Tomorrow Will Never Die