Skip to contentSkip to conversation

x86: simplify X86_MPPARSE config option

PATCH Applied Jan Beulich 3 participants 5 messages Oct 30, 2008 x86

lore
Share & tools
lore

Jan Beulich

author
#0 lore raw

PATCH 1/1 x86: simplify X86_MPPARSE config option

Signed-off-by Jan Beulich <[email protected]>
---
 arch/x86/Kconfig |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
arch/x86/Kconfig +2 -10
@@ -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"
#1 lore raw
Quoted 19 lines · Jan Beulich
Signed-off-by Jan Beulich <[email protected]>
---
 arch/x86/Kconfig |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
arch/x86/Kconfig +2 -3
@@ -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

arch/x86/Kconfig config X86_FIND_SMP_CONFIG · line 252

Quoted 10 lines
arch/x86/Kconfig +0 -7
 	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

author
#2 lore raw
Quoted 28 lines
Quoted 1 line
Quoted 1 line

Ingo Molnar <[email protected]> 30.10.08 11:51 >>>

Quoted 24 lines · Jan Beulich
Signed-off-by Jan Beulich <[email protected]>
---
 arch/x86/Kconfig |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
arch/x86/Kconfig +2 -5
@@ -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
-
Quoted 8 lines

arch/x86/Kconfig config X86_FIND_SMP_CONFIG · line 252

Quoted 5 lines
arch/x86/Kconfig +0 -5
-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

#3 lore raw
Quoted 37 lines · Jan Beulich
Quoted 28 lines
Quoted 1 line
Quoted 1 line

Ingo Molnar <[email protected]> 30.10.08 11:51 >>>

Quoted 24 lines · Jan Beulich
Signed-off-by Jan Beulich <[email protected]>
---
 arch/x86/Kconfig |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
arch/x86/Kconfig +2 -5
@@ -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
-
Quoted 8 lines

arch/x86/Kconfig config X86_FIND_SMP_CONFIG · line 252

Quoted 5 lines
arch/x86/Kconfig +0 -5
-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.

Quoted 2 lines

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.

Quoted 1 line

Jan

cu
Adrian

Signature · 4 lines
       "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
Applied
#4 lore raw
In reply to Jan Beulich
Quoted 37 lines · Jan Beulich
Quoted 28 lines
Quoted 1 line
Quoted 1 line

Ingo Molnar <[email protected]> 30.10.08 11:51 >>>

Quoted 24 lines · Jan Beulich
Signed-off-by Jan Beulich <[email protected]>
---
 arch/x86/Kconfig |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
arch/x86/Kconfig +2 -5
@@ -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
-
Quoted 8 lines

arch/x86/Kconfig config X86_FIND_SMP_CONFIG · line 252

Quoted 5 lines
arch/x86/Kconfig +0 -5
-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.

Quoted 2 lines

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