From: "Yinghai Lu" <yhlu.kernel@gmail.com>
To: "Alexey Starikovskiy" <astarikovskiy@suse.de>
Cc: mingo@elte.hu, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 5/5] x86: allow MPPARSE to be deselected in SMP configs
Date: Mon, 19 May 2008 13:08:07 -0700 [thread overview]
Message-ID: <86802c440805191308k5700fbb9x5ed76f7f58d11c69@mail.gmail.com> (raw)
In-Reply-To: <20080519154722.15071.91358.stgit@thinkpad>
On Mon, May 19, 2008 at 8:47 AM, Alexey Starikovskiy
<astarikovskiy@suse.de> wrote:
> Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
> ---
>
> arch/x86/Kconfig.debug | 2 +-
> arch/x86/kernel/setup.c | 2 +-
> arch/x86/kernel/setup_32.c | 2 +-
> arch/x86/kernel/setup_64.c | 4 ++++
> 4 files changed, 7 insertions(+), 3 deletions(-)
>
>
> diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
> index 5eb480e..f27de28 100644
> --- a/arch/x86/Kconfig.debug
> +++ b/arch/x86/Kconfig.debug
> @@ -128,7 +128,7 @@ config 4KSTACKS
>
> config X86_FIND_SMP_CONFIG
> def_bool y
> - depends on X86_LOCAL_APIC || X86_VOYAGER
> + depends on X86_MPPARSE || X86_VOYAGER || X86_VISWS
> depends on X86_32
>
> config X86_MPPARSE
> diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
> index 089ddfa..c86bda7 100644
> --- a/arch/x86/kernel/setup.c
> +++ b/arch/x86/kernel/setup.c
> @@ -12,7 +12,7 @@
> #include <asm/mpspec.h>
> #include <asm/apicdef.h>
>
> -#ifdef CONFIG_X86_MPPARSE
> +#ifdef CONFIG_X86_LOCAL_APIC
> unsigned int num_processors;
> unsigned disabled_cpus __cpuinitdata;
>
> diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
> index 12a31de..9af0d5f 100644
> --- a/arch/x86/kernel/setup_32.c
> +++ b/arch/x86/kernel/setup_32.c
> @@ -846,7 +846,7 @@ void __init setup_arch(char **cmdline_p)
> "CONFIG_X86_GENERICARCH or CONFIG_X86_BIGSMP.\n");
> #endif
> #endif
> -#ifdef CONFIG_X86_LOCAL_APIC
> +#if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS)
> if (smp_found_config)
> get_smp_config();
> #endif
> diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
> index 9234675..8047db9 100644
> --- a/arch/x86/kernel/setup_64.c
> +++ b/arch/x86/kernel/setup_64.c
> @@ -439,7 +439,9 @@ void __init setup_arch(char **cmdline_p)
> /*
> * Find and reserve possible boot-time SMP configuration:
> */
> +#ifdef CONFIG_X86_MPPARSE
> find_smp_config();
> +#endif
put the ifdef before the comments?
also if the mptable is not reserved in e820 table (buggy bios), we may
still need to call find_smp_config to reserved the mptable.
otherwise kexec to kernel without acpi support or acpi=off could fail,
because mptable could be damaged already.
> #ifdef CONFIG_BLK_DEV_INITRD
> if (boot_params.hdr.type_of_loader && boot_params.hdr.ramdisk_image) {
> unsigned long ramdisk_image = boot_params.hdr.ramdisk_image;
> @@ -485,8 +487,10 @@ void __init setup_arch(char **cmdline_p)
> /*
> * get boot-time SMP configuration:
> */
> +#ifdef CONFIG_X86_MPPARSE
> if (smp_found_config)
> get_smp_config();
> +#endif
put the ifdef before coments please.
> init_apic_mappings();
> ioapic_init_mappings();
YH
next prev parent reply other threads:[~2008-05-19 20:08 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-19 15:46 [PATCH 1/5] x86: move pic_mode to apic_32.c Alexey Starikovskiy
2008-05-19 15:47 ` [PATCH 2/5] x86: move smp_found_config Alexey Starikovskiy
2008-05-19 15:47 ` [PATCH 3/5] x86: mp_bus_id_to_pci_bus is not needed Alexey Starikovskiy
2008-05-22 21:50 ` [PATCH 3/5] x86: mp_bus_id_to_pci_bus is not needed, Thomas Gleixner
2008-05-22 21:59 ` Randy.Dunlap
2008-05-22 22:02 ` Maciej W. Rozycki
2008-05-19 15:47 ` [PATCH 4/5] x86: move mp_bus_not_pci from mpparse.c Alexey Starikovskiy
2008-05-22 22:00 ` Thomas Gleixner
2008-05-22 22:11 ` Alexey Starikovskiy
2008-05-23 7:09 ` Thomas Gleixner
2008-05-19 15:47 ` [PATCH 5/5] x86: allow MPPARSE to be deselected in SMP configs Alexey Starikovskiy
2008-05-19 20:08 ` Yinghai Lu [this message]
2008-05-19 20:29 ` [PATCH] " Alexey Starikovskiy
2008-05-22 21:45 ` [PATCH 1/5] x86: move pic_mode to apic_32.c Thomas Gleixner
2008-05-22 21:54 ` [PATCH 1/2] x86: Set pic_mode only if local apic code is present Alexey Starikovskiy
2008-05-22 21:54 ` [PATCH 2/2] x86: move pic_mode to apic_32.c Alexey Starikovskiy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86802c440805191308k5700fbb9x5ed76f7f58d11c69@mail.gmail.com \
--to=yhlu.kernel@gmail.com \
--cc=astarikovskiy@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®