Re: [2.6 patch] i386: cleanup boot_cpu_logical_apicid variables

[Andrey Panin]

On 105, 04 15, 2005 at 04:35:29PM +0200, Adrian Bunk wrote:
> There are currently two different boot_cpu_logical_apicid variables:
> - a global one in mpparse.c
> - a static one in smpboot.c
> 
> Of these two, only the one in smpboot.c might be used (through 
> boot_cpu_apicid).
> 
> This patch therefore removes the one in mpparse.c .
> 
> Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

Looks good. For the visws part:

Signed-off-by: Andrey Panin <pazke@xxxxxxxxx>

> ---
> 
>  arch/i386/kernel/mpparse.c     |    2 --
>  arch/i386/mach-visws/mpparse.c |    5 +----
>  2 files changed, 1 insertion(+), 6 deletions(-)
> 
> --- linux-2.6.12-rc2-mm3-full/arch/i386/kernel/mpparse.c.old	2005-04-15 14:21:41.000000000 +0200
> +++ linux-2.6.12-rc2-mm3-full/arch/i386/kernel/mpparse.c	2005-04-15 14:22:00.000000000 +0200
> @@ -67,7 +67,6 @@
>  
>  /* Processor that is doing the boot up */
>  unsigned int boot_cpu_physical_apicid = -1U;
> -unsigned int boot_cpu_logical_apicid = -1U;
>  /* Internal processor count */
>  static unsigned int __initdata num_processors;
>  
> @@ -180,7 +179,6 @@
>  	if (m->mpc_cpuflag & CPU_BOOTPROCESSOR) {
>  		Dprintk("    Bootup CPU\n");
>  		boot_cpu_physical_apicid = m->mpc_apicid;
> -		boot_cpu_logical_apicid = apicid;
>  	}
>  
>  	if (num_processors >= NR_CPUS) {
> --- linux-2.6.12-rc2-mm3-full/arch/i386/mach-visws/mpparse.c.old	2005-04-15 14:22:10.000000000 +0200
> +++ linux-2.6.12-rc2-mm3-full/arch/i386/mach-visws/mpparse.c	2005-04-15 14:22:27.000000000 +0200
> @@ -23,7 +23,6 @@
>  
>  /* Processor that is doing the boot up */
>  unsigned int boot_cpu_physical_apicid = -1U;
> -unsigned int boot_cpu_logical_apicid = -1U;
>  
>  /* Bitmask of physically existing CPUs */
>  physid_mask_t phys_cpu_present_map;
> @@ -52,10 +51,8 @@
>  		(m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
>  		m->mpc_apicver);
>  
> -	if (m->mpc_cpuflag & CPU_BOOTPROCESSOR) {
> +	if (m->mpc_cpuflag & CPU_BOOTPROCESSOR)
>  		boot_cpu_physical_apicid = m->mpc_apicid;
> -		boot_cpu_logical_apicid = logical_apicid;
> -	}
>  
>  	ver = m->mpc_apicver;
>  	if ((ver >= 0x14 && m->mpc_apicid >= 0xff) || m->mpc_apicid >= 0xf) {
> 
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
> 

-- 
Andrey Panin		| Linux and UNIX system administrator
pazke@xxxxxxxxx		| PGP key: wwwkeys.pgp.net
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/