Re: [PATCH] x86: update mptable v7 - fix

[Yinghai Lu]

On Mon, Jun 9, 2008 at 3:13 AM, Ingo Molnar <mingo@xxxxxxx> wrote:
>
> * Yinghai Lu <yhlu.kernel@xxxxxxxxx> wrote:
>
>> [PATCH] x86: update mptable v7 - fix
>>
>> need to call early_reserve_e820 to prelocate mptable for 32bit
>>
>> Signed-off-by: Yinghai Lu <yhlu.kernel@xxxxxxxxx>
>>
>> Index: linux-2.6/arch/x86/kernel/setup_32.c
>> ===================================================================
>> --- linux-2.6.orig/arch/x86/kernel/setup_32.c
>> +++ linux-2.6/arch/x86/kernel/setup_32.c
>> @@ -761,6 +761,8 @@ void __init setup_arch(char **cmdline_p)
>>        */
>>       max_pfn = e820_end_of_ram();
>>
>> +     /* pre allocte 4k for mptable mpc */
>> +     early_reserve_e820_mpc_new();
>
> applied, thanks. It needed the small build fix below as well, for UP
> 32-bit.
>
>        Ingo
>
> --------------->
> commit 3c803fb3e1972566f7a1613f53f7e5a70fbde83f
> Author: Ingo Molnar <mingo@xxxxxxx>
> Date:   Sun May 25 21:16:06 2008 +0200
>
>    x86, mpparse: build fix
>
>    fix:
>
>      LD      .tmp_vmlinux1
>      arch/x86/kernel/built-in.o: In function `setup_arch':
>      : undefined reference to `early_reserve_e820_mpc_new'
>
>    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
>
> diff --git a/include/asm-x86/mpspec.h b/include/asm-x86/mpspec.h
> index 6e9c958..b8ba374 100644
> --- a/include/asm-x86/mpspec.h
> +++ b/include/asm-x86/mpspec.h
> @@ -46,7 +46,11 @@ extern unsigned long mp_lapic_addr;
>
>  extern void find_smp_config(void);
>  extern void get_smp_config(void);
> +#ifdef CONFIG_X86_MPPARSE
>  extern void early_reserve_e820_mpc_new(void);
> +#else
> +static inline void early_reserve_e820_mpc_new(void) { }
> +#endif
>
>  void __cpuinit generic_processor_info(int apicid, int version);
>  #ifdef CONFIG_ACPI

thanks. So X86_MPPARSE is not needed when SMP is not enabled?

YH
--
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/