svn commit: r290547 - in head/sys: arm/annapurna/alpine arm/mv/armadaxp arm/qemu arm/ti/omap4 arm/xilinx kern x86/x86

[Bjoern A. Zeeb]

> On 08 Nov 2015, at 14:26 , Tijl Coosemans <tijl at freebsd.org> wrote:
> 
> Author: tijl
> Date: Sun Nov  8 14:26:50 2015
> New Revision: 290547
> URL: https://svnweb.freebsd.org/changeset/base/290547
> 
> 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.
> 
>  Reviewed by:	kib (x86 part)
> 
> 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 = 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 = 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 = 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 = 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 = MIN(ncpus, MAXCPU);
                 ^ ~~~~~~~~~~~~~~~~~~
5 errors generated.
--- virt_mp.o ---
*** [virt_mp.o] Error code 1

— 
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."