LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Roman Zippel <zippel@linux-m68k.org>
To: Sam Ravnborg <sam@ravnborg.org>
Cc: Ingo Molnar <mingo@elte.hu>,
	Andrew Morton <akpm@linux-foundation.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	kiran@scalemp.com, shai@scalemp.com,
	Glauber Costa <gcosta@redhat.com>,
	linux-kbuild <linux-kbuild@vger.kernel.org>,
	Yinghai Lu <Yinghai.Lu@Sun.COM>
Subject: [PATCH 1/3] fix recursive dependencies
Date: Fri, 29 Feb 2008 05:09:02 +0100 (CET)	[thread overview]
Message-ID: <Pine.LNX.4.64.0802290443440.2723@scrub.home> (raw)
In-Reply-To: <20080226194058.GA31438@uranus.ravnborg.org>

Hi,

On Tue, 26 Feb 2008, Sam Ravnborg wrote:

> We discovered a situation where we could set a
> choice value in menuconfig but later when we either was
> running menuconfig or oldconfig the value were changed.

The patch fixes these dependency problems.

bye, Roman


The proper dependency check uncovered a few dependency problems,
the subarchitecture used a mixture of selects and depends on SMP
and PCI dependency was messed up.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>

---
 arch/x86/Kconfig |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

Index: linux-2.6/arch/x86/Kconfig
===================================================================
--- linux-2.6.orig/arch/x86/Kconfig
+++ linux-2.6/arch/x86/Kconfig
@@ -243,8 +243,7 @@ config X86_ELAN
 
 config X86_VOYAGER
 	bool "Voyager (NCR)"
-	depends on X86_32
-	select SMP if !BROKEN
+	depends on X86_32 && (SMP || BROKEN)
 	help
 	  Voyager is an MCA-based 32-way capable SMP architecture proprietary
 	  to NCR Corp.  Machine classes 345x/35xx/4100/51xx are Voyager-based.
@@ -256,9 +255,8 @@ config X86_VOYAGER
 
 config X86_NUMAQ
 	bool "NUMAQ (IBM/Sequent)"
-	select SMP
+	depends on SMP && X86_32
 	select NUMA
-	depends on X86_32
 	help
 	  This option is used for getting Linux to run on a (IBM/Sequent) NUMA
 	  multiquad box. This changes the way that processors are bootstrapped,
@@ -329,7 +327,7 @@ config X86_RDC321X
 
 config X86_VSMP
 	bool "Support for ScaleMP vSMP"
-	depends on X86_64 && PCI
+	depends on X86_64
 	 help
 	  Support for ScaleMP vSMP systems.  Say 'Y' here if this kernel is
 	  supposed to run on these EM64T-based machines.  Only choose this option
@@ -1381,7 +1379,7 @@ endmenu
 menu "Bus options (PCI etc.)"
 
 config PCI
-	bool "PCI support" if !X86_VISWS
+	bool "PCI support" if !X86_VISWS && !X86_VSMP
 	depends on !X86_VOYAGER
 	default y
 	select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)

  parent reply	other threads:[~2008-02-29  4:09 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-21 10:58 [PATCH] x86_64: make amd quad core 8 socket system not be clustered_box Yinghai Lu
2008-02-22 12:25 ` Andi Kleen
2008-02-22 19:02   ` Yinghai Lu
2008-02-22 19:00     ` Andi Kleen
2008-02-22 19:04       ` Yinghai Lu
2008-02-22 19:07         ` Andi Kleen
2008-02-22 19:07           ` Yinghai Lu
2008-02-22 19:10             ` Andi Kleen
2008-02-23  8:55               ` Yinghai Lu
2008-02-24  5:48       ` [PATCH] x86_64: make amd quad core 8 socket system not be clustered_box v2 Yinghai Lu
2008-02-24  7:50         ` Ingo Molnar
2008-02-24 12:29         ` Andi Kleen
2008-02-24 23:00           ` Yinghai Lu
2008-02-25  1:52             ` Yinghai Lu
2008-02-25  2:32             ` Yinghai Lu
2008-02-25  5:36               ` [PATCH] x86_64: for apic_is_clustered_box for vsmp v2 Yinghai Lu
2008-02-25  6:43                 ` [PATCH] x86: vSMP selection in config Yinghai Lu
2008-02-26 19:40                   ` Kconfig configuration restore bug [Was: x86: vSMP selection in config] Sam Ravnborg
2008-02-27  2:59                     ` Roman Zippel
2008-02-29  4:09                     ` Roman Zippel [this message]
2008-02-29  5:05                       ` [PATCH 1/3] fix recursive dependencies Yinghai Lu
2008-02-29 13:22                         ` Roman Zippel
2008-02-29 17:40                           ` Sam Ravnborg
2008-02-29 20:05                             ` Ingo Molnar
2008-02-29 20:04                       ` Ingo Molnar
2008-02-29  4:10                     ` [PATCH 2/3] fix choice dependency check Roman Zippel
2008-04-28 21:08                       ` Sam Ravnborg
2008-02-29  4:11                     ` [PATCH 3/3] add named choice group Roman Zippel
2008-02-26 20:05                   ` [PATCH] x86: vSMP selection in config Sam Ravnborg
2008-02-26 21:03                     ` Yinghai Lu
2008-02-25  5:39           ` [PATCH] x86_64: make amd quad core 8 socket system not be clustered_box v2 Yinghai Lu
2008-02-25 19:08           ` Ravikiran Thirumalai
2008-02-25 22:05             ` Yinghai Lu
2008-02-26  3:39               ` Ravikiran Thirumalai
2008-02-26  3:46                 ` Andi Kleen
2008-02-26  4:05                   ` Ravikiran Thirumalai
2008-02-26  5:27                     ` Yinghai Lu
2008-02-26 18:42                       ` Ravikiran Thirumalai
2008-02-26 19:00                         ` Yinghai Lu
2008-02-26 20:32                           ` Ravikiran Thirumalai
2008-02-26 21:09                             ` Yinghai Lu
2008-02-26 21:10                             ` Yinghai Lu
2008-02-26 21:24                               ` Ravikiran Thirumalai
2008-02-26 23:16                                 ` Yinghai Lu
2008-02-26 23:31                                   ` Ravikiran Thirumalai
2008-02-26 23:41                                     ` Yinghai Lu
2008-02-22 19:08     ` [PATCH] x86_64: make amd quad core 8 socket system not be clustered_box Yinghai Lu
2008-02-22 18:59       ` Andi Kleen

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=Pine.LNX.4.64.0802290443440.2723@scrub.home \
    --to=zippel@linux-m68k.org \
    --cc=Yinghai.Lu@Sun.COM \
    --cc=akpm@linux-foundation.org \
    --cc=gcosta@redhat.com \
    --cc=kiran@scalemp.com \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=sam@ravnborg.org \
    --cc=shai@scalemp.com \
    --subject='Re: [PATCH 1/3] fix recursive dependencies' \
    /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

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).