LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] x86: simplify X86_MPPARSE config option
@ 2008-10-30 10:38 Jan Beulich
  2008-10-30 10:51 ` Ingo Molnar
  0 siblings, 1 reply; 5+ messages in thread
From: Jan Beulich @ 2008-10-30 10:38 UTC (permalink / raw)
  To: mingo, tglx, hpa; +Cc: linux-kernel

Signed-off-by: Jan Beulich <jbeulich@novell.com>

---
 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"




^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] x86: simplify X86_MPPARSE config option
  2008-10-30 10:38 [PATCH] x86: simplify X86_MPPARSE config option Jan Beulich
@ 2008-10-30 10:51 ` Ingo Molnar
  2008-10-30 11:01   ` Jan Beulich
  0 siblings, 1 reply; 5+ messages in thread
From: Ingo Molnar @ 2008-10-30 10:51 UTC (permalink / raw)
  To: Jan Beulich; +Cc: tglx, hpa, linux-kernel


* Jan Beulich <jbeulich@novell.com> wrote:

> Signed-off-by: Jan Beulich <jbeulich@novell.com>
> 
> ---
>  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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] x86: simplify X86_MPPARSE config option
  2008-10-30 10:51 ` Ingo Molnar
@ 2008-10-30 11:01   ` Jan Beulich
  2008-10-30 12:28     ` Adrian Bunk
  2008-10-30 18:14     ` Ingo Molnar
  0 siblings, 2 replies; 5+ messages in thread
From: Jan Beulich @ 2008-10-30 11:01 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: tglx, linux-kernel, hpa

>>> Ingo Molnar <mingo@elte.hu> 30.10.08 11:51 >>>
>
>* Jan Beulich <jbeulich@novell.com> wrote:
>
>> Signed-off-by: Jan Beulich <jbeulich@novell.com>
>> 
>> ---
>>  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


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] x86: simplify X86_MPPARSE config option
  2008-10-30 11:01   ` Jan Beulich
@ 2008-10-30 12:28     ` Adrian Bunk
  2008-10-30 18:14     ` Ingo Molnar
  1 sibling, 0 replies; 5+ messages in thread
From: Adrian Bunk @ 2008-10-30 12:28 UTC (permalink / raw)
  To: Jan Beulich; +Cc: Ingo Molnar, tglx, linux-kernel, hpa

On Thu, Oct 30, 2008 at 11:01:22AM +0000, Jan Beulich wrote:
> >>> Ingo Molnar <mingo@elte.hu> 30.10.08 11:51 >>>
> >
> >* Jan Beulich <jbeulich@novell.com> wrote:
> >
> >> Signed-off-by: Jan Beulich <jbeulich@novell.com>
> >> 
> >> ---
> >>  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


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] x86: simplify X86_MPPARSE config option
  2008-10-30 11:01   ` Jan Beulich
  2008-10-30 12:28     ` Adrian Bunk
@ 2008-10-30 18:14     ` Ingo Molnar
  1 sibling, 0 replies; 5+ messages in thread
From: Ingo Molnar @ 2008-10-30 18:14 UTC (permalink / raw)
  To: Jan Beulich; +Cc: tglx, linux-kernel, hpa


* Jan Beulich <jbeulich@novell.com> wrote:

> >>> Ingo Molnar <mingo@elte.hu> 30.10.08 11:51 >>>
> >
> >* Jan Beulich <jbeulich@novell.com> wrote:
> >
> >> Signed-off-by: Jan Beulich <jbeulich@novell.com>
> >> 
> >> ---
> >>  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

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2008-10-30 18:15 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-10-30 10:38 [PATCH] x86: simplify X86_MPPARSE config option Jan Beulich
2008-10-30 10:51 ` Ingo Molnar
2008-10-30 11:01   ` Jan Beulich
2008-10-30 12:28     ` Adrian Bunk
2008-10-30 18:14     ` Ingo Molnar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).