From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:53:59 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94B1B3AA; Mon, 8 Sep 2014 04:53:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8638D554 for ; Mon, 8 Sep 2014 04:52:27 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 69A4B1FFD for ; Mon, 8 Sep 2014 04:52:27 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884qRQc029705 for ; Mon, 8 Sep 2014 04:52:27 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884qRLT029702 for perforce@freebsd.org; Mon, 8 Sep 2014 04:52:27 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:52:27 GMT Message-Id: <201409080452.s884qRLT029702@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199799 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:53:59 -0000 http://p4web.freebsd.org/@@1199799?ac=10 Change 1199799 by jhb@jhb_ralph on 2014/09/04 02:36:12 Add a merged identcpu.c. Affected files ... .. //depot/projects/smpng/sys/conf/files.amd64#105 edit .. //depot/projects/smpng/sys/conf/files.i386#163 edit .. //depot/projects/smpng/sys/conf/files.pc98#121 edit .. //depot/projects/smpng/sys/i386/i386/initcpu.c#47 edit .. //depot/projects/smpng/sys/i386/include/md_var.h#43 edit .. //depot/projects/smpng/sys/x86/x86/identcpu.c#1 add Differences ... ==== //depot/projects/smpng/sys/conf/files.amd64#105 (text+ko) ==== @@ -103,7 +103,6 @@ amd64/amd64/exception.S standard amd64/amd64/fpu.c standard amd64/amd64/gdb_machdep.c optional gdb -amd64/amd64/identcpu.c standard amd64/amd64/in_cksum.c optional inet | inet6 amd64/amd64/initcpu.c standard amd64/amd64/io.c optional io @@ -542,6 +541,7 @@ x86/x86/busdma_machdep.c standard x86/x86/dump_machdep.c standard x86/x86/fdt_machdep.c optional fdt +x86/x86/identcpu.c standard x86/x86/intr_machdep.c standard x86/x86/io_apic.c standard x86/x86/legacy.c standard ==== //depot/projects/smpng/sys/conf/files.i386#163 (text+ko) ==== @@ -443,7 +443,6 @@ i386/i386/gdb_machdep.c optional gdb i386/i386/geode.c optional cpu_geode i386/i386/i686_mem.c optional mem -i386/i386/identcpu.c standard i386/i386/in_cksum.c optional inet | inet6 i386/i386/initcpu.c standard i386/i386/io.c optional io @@ -581,6 +580,7 @@ x86/x86/busdma_machdep.c standard x86/x86/dump_machdep.c standard x86/x86/fdt_machdep.c optional fdt +x86/x86/identcpu.c standard x86/x86/intr_machdep.c standard x86/x86/io_apic.c optional apic x86/x86/legacy.c optional native ==== //depot/projects/smpng/sys/conf/files.pc98#121 (text+ko) ==== @@ -140,7 +140,6 @@ i386/i386/exception.s standard i386/i386/gdb_machdep.c optional gdb i386/i386/i686_mem.c optional mem -i386/i386/identcpu.c standard i386/i386/in_cksum.c optional inet | inet6 i386/i386/initcpu.c standard i386/i386/io.c optional io @@ -248,6 +247,7 @@ x86/x86/busdma_bounce.c standard x86/x86/busdma_machdep.c standard x86/x86/dump_machdep.c standard +x86/x86/identcpu.c standard x86/x86/intr_machdep.c standard x86/x86/io_apic.c optional apic x86/x86/legacy.c standard ==== //depot/projects/smpng/sys/i386/i386/initcpu.c#47 (text+ko) ==== @@ -95,6 +95,7 @@ u_int cpu_mxcsr_mask; /* Valid bits in mxcsr */ #endif u_int cpu_clflush_line_size = 32; +u_int cpu_stdext_feature; u_int cpu_mon_mwait_flags; /* MONITOR/MWAIT flags (CPUID.05H.ECX) */ u_int cpu_mon_min_size; /* MONITOR minimum range size, bytes */ u_int cpu_mon_max_size; /* MONITOR minimum range size, bytes */ ==== //depot/projects/smpng/sys/i386/include/md_var.h#43 (text+ko) ==== @@ -48,6 +48,7 @@ extern u_int via_feature_rng; extern u_int via_feature_xcrypt; extern u_int cpu_clflush_line_size; +extern u_int cpu_stdext_feature; extern u_int cpu_fxsr; extern u_int cpu_high; extern u_int cpu_id;