Signed-off-by: Jan Beulich <[email protected]>
---
arch/x86/Kconfig | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
--- linux-2.6.28-rc2/arch/x86/Kconfig 2008-10-30 11:03:18.000000000 +0100
+++ 2.6.28-rc2-x86-kconfig-cleanup/arch/x86/Kconfig 2008-10-21 13:57:07.000000000 +0200
@@ -235,21 +235,13 @@ config X86_FIND_SMP_CONFIG
def_bool y
depends on X86_MPPARSE || X86_VOYAGER
-if ACPI
config X86_MPPARSE
- def_bool y
- bool "Enable MPS table"
+ bool "Enable MPS table" if ACPI
+ default y
depends on X86_LOCAL_APIC
help
For old smp systems that do not have proper acpi support. Newer systems
(esp with 64bit cpus) with acpi support, MADT and DSDT will override it
-endif
-
-if !ACPI
-config X86_MPPARSE
- def_bool y
- depends on X86_LOCAL_APIC
-endif
choice
prompt "Subarchitecture Type"
* Jan Beulich <[email protected]> wrote:
> Signed-off-by: Jan Beulich <[email protected]>
>
> ---
> arch/x86/Kconfig | 12 ++----------
> 1 file changed, 2 insertions(+), 10 deletions(-)
>
> --- linux-2.6.28-rc2/arch/x86/Kconfig 2008-10-30 11:03:18.000000000 +0100
> +++ 2.6.28-rc2-x86-kconfig-cleanup/arch/x86/Kconfig 2008-10-21 13:57:07.000000000 +0200
> @@ -235,21 +235,13 @@ config X86_FIND_SMP_CONFIG
> def_bool y
> depends on X86_MPPARSE || X86_VOYAGER
>
> -if ACPI
> config X86_MPPARSE
> - def_bool y
> - bool "Enable MPS table"
> + bool "Enable MPS table" if ACPI
> + default y
> depends on X86_LOCAL_APIC
> help
> For old smp systems that do not have proper acpi support. Newer systems
> (esp with 64bit cpus) with acpi support, MADT and DSDT will override it
> -endif
> -
> -if !ACPI
> -config X86_MPPARSE
> - def_bool y
> - depends on X86_LOCAL_APIC
> -endif
hm, that's not an equivalent change. But i guess we can do this, it
sure looks like a cleaner construct.
Ingo
>>> Ingo Molnar <[email protected]> 30.10.08 11:51 >>>
>
>* Jan Beulich <[email protected]> wrote:
>
>> Signed-off-by: Jan Beulich <[email protected]>
>>
>> ---
>> arch/x86/Kconfig | 12 ++----------
>> 1 file changed, 2 insertions(+), 10 deletions(-)
>>
>> --- linux-2.6.28-rc2/arch/x86/Kconfig 2008-10-30 11:03:18.000000000 +0100
>> +++ 2.6.28-rc2-x86-kconfig-cleanup/arch/x86/Kconfig 2008-10-21 13:57:07.000000000 +0200
>> @@ -235,21 +235,13 @@ config X86_FIND_SMP_CONFIG
>> def_bool y
>> depends on X86_MPPARSE || X86_VOYAGER
>>
>> -if ACPI
>> config X86_MPPARSE
>> - def_bool y
>> - bool "Enable MPS table"
>> + bool "Enable MPS table" if ACPI
>> + default y
>> depends on X86_LOCAL_APIC
>> help
>> For old smp systems that do not have proper acpi support. Newer systems
>> (esp with 64bit cpus) with acpi support, MADT and DSDT will override it
>> -endif
>> -
>> -if !ACPI
>> -config X86_MPPARSE
>> - def_bool y
>> - depends on X86_LOCAL_APIC
>> -endif
>
>hm, that's not an equivalent change. But i guess we can do this, it
>sure looks like a cleaner construct.
Why is it not equivalent (apart from the help portion, which doesn't
matter when the prompt isn't visible)?
Jan
On Thu, Oct 30, 2008 at 11:01:22AM +0000, Jan Beulich wrote:
> >>> Ingo Molnar <[email protected]> 30.10.08 11:51 >>>
> >
> >* Jan Beulich <[email protected]> wrote:
> >
> >> Signed-off-by: Jan Beulich <[email protected]>
> >>
> >> ---
> >> arch/x86/Kconfig | 12 ++----------
> >> 1 file changed, 2 insertions(+), 10 deletions(-)
> >>
> >> --- linux-2.6.28-rc2/arch/x86/Kconfig 2008-10-30 11:03:18.000000000 +0100
> >> +++ 2.6.28-rc2-x86-kconfig-cleanup/arch/x86/Kconfig 2008-10-21 13:57:07.000000000 +0200
> >> @@ -235,21 +235,13 @@ config X86_FIND_SMP_CONFIG
> >> def_bool y
> >> depends on X86_MPPARSE || X86_VOYAGER
> >>
> >> -if ACPI
> >> config X86_MPPARSE
> >> - def_bool y
> >> - bool "Enable MPS table"
> >> + bool "Enable MPS table" if ACPI
> >> + default y
> >> depends on X86_LOCAL_APIC
> >> help
> >> For old smp systems that do not have proper acpi support. Newer systems
> >> (esp with 64bit cpus) with acpi support, MADT and DSDT will override it
> >> -endif
> >> -
> >> -if !ACPI
> >> -config X86_MPPARSE
> >> - def_bool y
> >> - depends on X86_LOCAL_APIC
> >> -endif
> >
> >hm, that's not an equivalent change. But i guess we can do this, it
> >sure looks like a cleaner construct.
>
> Why is it not equivalent (apart from the help portion, which doesn't
> matter when the prompt isn't visible)?
Don't trust Ingo on kconfig issues, you are right.
> Jan
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
* Jan Beulich <[email protected]> wrote:
> >>> Ingo Molnar <[email protected]> 30.10.08 11:51 >>>
> >
> >* Jan Beulich <[email protected]> wrote:
> >
> >> Signed-off-by: Jan Beulich <[email protected]>
> >>
> >> ---
> >> arch/x86/Kconfig | 12 ++----------
> >> 1 file changed, 2 insertions(+), 10 deletions(-)
> >>
> >> --- linux-2.6.28-rc2/arch/x86/Kconfig 2008-10-30 11:03:18.000000000 +0100
> >> +++ 2.6.28-rc2-x86-kconfig-cleanup/arch/x86/Kconfig 2008-10-21 13:57:07.000000000 +0200
> >> @@ -235,21 +235,13 @@ config X86_FIND_SMP_CONFIG
> >> def_bool y
> >> depends on X86_MPPARSE || X86_VOYAGER
> >>
> >> -if ACPI
> >> config X86_MPPARSE
> >> - def_bool y
> >> - bool "Enable MPS table"
> >> + bool "Enable MPS table" if ACPI
> >> + default y
> >> depends on X86_LOCAL_APIC
> >> help
> >> For old smp systems that do not have proper acpi support. Newer systems
> >> (esp with 64bit cpus) with acpi support, MADT and DSDT will override it
> >> -endif
> >> -
> >> -if !ACPI
> >> -config X86_MPPARSE
> >> - def_bool y
> >> - depends on X86_LOCAL_APIC
> >> -endif
> >
> >hm, that's not an equivalent change. But i guess we can do this, it
> >sure looks like a cleaner construct.
>
> Why is it not equivalent (apart from the help portion, which doesn't
> matter when the prompt isn't visible)?
you are right, it's equivalent - the "if ACPI" makes interactivity
(the prompt) conditional, not the option.
applied to tip/x86/cleanups, thanks!
Ingo