From owner-svn-src-head@freebsd.org Mon Nov 9 17:45:53 2015 Return-Path: Delivered-To: svn-src-head@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 F303CA2A7BC; Mon, 9 Nov 2015 17:45:52 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:130:3ffc::401:25]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 824A51B2E; Mon, 9 Nov 2015 17:45:52 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 02A3A25D3A6E; Mon, 9 Nov 2015 17:45:49 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 43FB6C77092; Mon, 9 Nov 2015 17:45:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id q-UsWMJ5qCC0; Mon, 9 Nov 2015 17:45:47 +0000 (UTC) Received: from [IPv6:fde9:577b:c1a9:4420:cabc:c8ff:fe8b:4fe6] (orange-tun0-ula.sbone.de [IPv6:fde9:577b:c1a9:4420:cabc:c8ff:fe8b:4fe6]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 5C5F0C77091; Mon, 9 Nov 2015 17:45:47 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2104\)) Subject: Re: svn commit: r290547 - in head/sys: arm/annapurna/alpine arm/mv/armadaxp arm/qemu arm/ti/omap4 arm/xilinx kern x86/x86 From: "Bjoern A. Zeeb" In-Reply-To: <201511081426.tA8EQopT086552@repo.freebsd.org> Date: Mon, 9 Nov 2015 17:45:46 +0000 Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <3CA6AE10-0DBA-4130-A76C-524F387907A8@FreeBSD.org> References: <201511081426.tA8EQopT086552@repo.freebsd.org> To: Tijl Coosemans X-Mailer: Apple Mail (2.2104) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Nov 2015 17:45:53 -0000 > On 08 Nov 2015, at 14:26 , Tijl Coosemans wrote: >=20 > Author: tijl > Date: Sun Nov 8 14:26:50 2015 > New Revision: 290547 > URL: https://svnweb.freebsd.org/changeset/base/290547 >=20 > Log: > Since r289279 bufinit() uses mp_ncpus, but some architectures set = this > variable during mp_start() which is too late. Move this to = mp_setmaxid() > where other architectures set it and move x86 assertions to MI code. >=20 > Reviewed by: kib (x86 part) >=20 > Modified: > head/sys/arm/annapurna/alpine/alpine_machdep_mp.c > head/sys/arm/mv/armadaxp/armadaxp_mp.c > head/sys/arm/qemu/virt_mp.c Seems copy and paste from the old to the new function brought some = confusion n variable naming; can you please fix? /home/baz21/SVN/head-ipv6-fix.svn/sys/arm/qemu/virt_mp.c:74:17: error: = use of undeclared identifier 'ncpus'; did you mean 'pcpup'? mp_ncpus =3D MIN(ncpus, MAXCPU); ^~~~~ pcpup /home/baz21/SVN/head-ipv6-fix.svn/sys/sys/param.h:301:21: note: expanded = from macro 'MIN' #define MIN(a,b) (((a)<(b))?(a):(b)) ^ ./machine/pcpu.h:65:21: note: 'pcpup' declared here extern struct pcpu *pcpup; ^ /home/baz21/SVN/head-ipv6-fix.svn/sys/arm/qemu/virt_mp.c:74:13: error: = ordered comparison between pointer and integer ('struct pcpu *' and = 'int') [-Werror] mp_ncpus =3D MIN(ncpus, MAXCPU); ^~~~~~~~~~~~~~~~~~ /home/baz21/SVN/head-ipv6-fix.svn/sys/sys/param.h:301:23: note: expanded = from macro 'MIN' #define MIN(a,b) (((a)<(b))?(a):(b)) ~~~^~~~ /home/baz21/SVN/head-ipv6-fix.svn/sys/arm/qemu/virt_mp.c:74:17: error: = use of undeclared identifier 'ncpus'; did you mean 'pcpup'? mp_ncpus =3D MIN(ncpus, MAXCPU); ^~~~~ pcpup /home/baz21/SVN/head-ipv6-fix.svn/sys/sys/param.h:301:30: note: expanded = from macro 'MIN' #define MIN(a,b) (((a)<(b))?(a):(b)) ^ ./machine/pcpu.h:65:21: note: 'pcpup' declared here extern struct pcpu *pcpup; ^ /home/baz21/SVN/head-ipv6-fix.svn/sys/arm/qemu/virt_mp.c:74:13: error: = pointer/integer type mismatch in conditional expression ('struct pcpu *' = and 'int') [-Werror,-Wconditional-type-mismatch] mp_ncpus =3D MIN(ncpus, MAXCPU); ^~~~~~~~~~~~~~~~~~ /home/baz21/SVN/head-ipv6-fix.svn/sys/sys/param.h:301:28: note: expanded = from macro 'MIN' #define MIN(a,b) (((a)<(b))?(a):(b)) ^~~~ ~~~ /home/baz21/SVN/head-ipv6-fix.svn/sys/arm/qemu/virt_mp.c:74:11: error: = incompatible pointer to integer conversion assigning to 'int' from = 'struct pcpu *' [-Werror,-Wint-conversion] mp_ncpus =3D MIN(ncpus, MAXCPU); ^ ~~~~~~~~~~~~~~~~~~ 5 errors generated. --- virt_mp.o --- *** [virt_mp.o] Error code 1 =E2=80=94=20 Bjoern A. Zeeb Charles Haddon Spurgeon: "Friendship is one of the sweetest joys of life. Many might have failed beneath the bitterness of their trial had they not found a friend."