From: tip-bot for Daniel J Blueman <daniel@numascale-asia.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
sp@numascale.com, tglx@linutronix.de, mingo@elte.hu,
daniel@numascale-asia.com
Subject: [tip:x86/urgent] x86/numachip: Drop unnecessary conflict with EDAC
Date: Thu, 26 Jan 2012 05:38:45 -0800 [thread overview]
Message-ID: <tip-3fe54564a61f72982032423d24041dca30617ca2@git.kernel.org> (raw)
In-Reply-To: <1327473349-28395-1-git-send-email-daniel@numascale-asia.com>
Commit-ID: 3fe54564a61f72982032423d24041dca30617ca2
Gitweb: http://git.kernel.org/tip/3fe54564a61f72982032423d24041dca30617ca2
Author: Daniel J Blueman <daniel@numascale-asia.com>
AuthorDate: Wed, 25 Jan 2012 14:35:49 +0800
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Thu, 26 Jan 2012 11:03:03 +0100
x86/numachip: Drop unnecessary conflict with EDAC
EDAC detection no longer crashes multi-node systems, so don't
conflict on it with NumaChip.
Signed-off-by: Daniel J Blueman <daniel@numascale-asia.com>
Cc: Steffen Persvold <sp@numascale.com>
Link: http://lkml.kernel.org/r/1327473349-28395-1-git-send-email-daniel@numascale-asia.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/Kconfig | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 864cc6e..5bed94e 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -360,7 +360,6 @@ config X86_NUMACHIP
depends on NUMA
depends on SMP
depends on X86_X2APIC
- depends on !EDAC_AMD64
---help---
Adds support for Numascale NumaChip large-SMP systems. Needed to
enable more than ~168 cores.
prev parent reply other threads:[~2012-01-26 13:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-25 6:35 [PATCH] Drop unnecessary NumaChip " Daniel J Blueman
2012-01-26 13:38 ` tip-bot for Daniel J Blueman [this message]
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=tip-3fe54564a61f72982032423d24041dca30617ca2@git.kernel.org \
--to=daniel@numascale-asia.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=sp@numascale.com \
--cc=tglx@linutronix.de \
/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®