From patchwork Wed Feb 10 16:20:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 45045 X-Patchwork-Delegate: apw@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 0BCCAB7C8E for ; Thu, 11 Feb 2010 03:21:15 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NfFJO-0004z3-29; Wed, 10 Feb 2010 16:21:10 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NfFJJ-0004wW-H6 for kernel-team@lists.ubuntu.com; Wed, 10 Feb 2010 16:21:05 +0000 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1NfFJH-0003sA-MW for ; Wed, 10 Feb 2010 16:21:04 +0000 Received: from 79-66-134-188.dynamic.dsl.as9105.com ([79.66.134.188] helo=localhost.localdomain) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1NfFJH-0003Nj-J0 for kernel-team@lists.ubuntu.com; Wed, 10 Feb 2010 16:21:03 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/4] x86, mce: Make xeon75xx memory driver dependent on PCI Date: Wed, 10 Feb 2010 16:20:59 +0000 Message-Id: <1265818860-32016-4-git-send-email-apw@canonical.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1265818860-32016-1-git-send-email-apw@canonical.com> References: <1265818860-32016-1-git-send-email-apw@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Andi Kleen commit 757fd770c649b0dfa6eeefc2d5e2ea3119b6be9c upstream (linux-2.6-tip) Found by Ingo Molnar's automated tester. Reported-by: Ingo Molnar Signed-off-by: Andi Kleen LKML-Reference: <20100123113359.GA29555@one.firstfloor.org> Signed-off-by: H. Peter Anvin Signed-off-by: Andy Whitcroft --- arch/x86/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 8b4d299..578dfdc 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -835,7 +835,7 @@ config X86_MCE_INTEL config X86_MCE_XEON75XX tristate "Intel Xeon 7500 series corrected memory error driver" - depends on X86_MCE_INTEL + depends on X86_MCE_INTEL && PCI ---help--- Add support for a Intel Xeon 7500 series specific memory error driver. This allows to report the DIMM and physical address on a corrected