Re: [patch 2/2] Convert bigsmp to use flat physical mode

[Andrew Morton]

Ashok Raj <ashok.raj@xxxxxxxxx> wrote:
>
> @@ -219,13 +225,18 @@ static void __devinit MP_processor_info 
>   	cpu_set(num_processors, cpu_possible_map);
>   	num_processors++;
>   
>  -	if ((num_processors > 8) &&
>  -	    APIC_XAPIC(ver) &&
>  -	    (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL))
>  -		def_to_bigsmp = 1;
>  -	else
>  -		def_to_bigsmp = 0;
>  -
>  +	if (CPU_HOTPLUG_ENABLED || (num_processors > 8)) {
>  +		switch (boot_cpu_data.x86_vendor) {
>  +			case X86_VENDOR_INTEL:
>  +				if (!APIC_XAPIC(ver)) {
>  +					def_to_bigsmp = 0;
>  +					break;
>  +				}
>  +				/* If P4 and above fall through */
>  +			case X86_VENDOR_AMD:
>  +				def_to_bigsmp = 1;
>  +		}
>  +	}
>   	bios_cpu_apicid[num_processors - 1] = m->mpc_apicid;

The code you're patching here is changed:

	if ((num_processors > 8) &&
	    ((APIC_XAPIC(ver) &&
	     (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)) ||
	     (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)))
		def_to_bigsmp = 1;

But the fixup was obvious.

While I was there I unindented the body of the switch statement by one tab
stop, as we usually do.

Please avoid sending multiple patches with the same Subject:, thanks.
-
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/