From patchwork Wed Jul 21 16:46:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Bounine, Alexandre" X-Patchwork-Id: 59568 X-Patchwork-Delegate: galak@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 6AD9EB7315 for ; Thu, 22 Jul 2010 23:08:03 +1000 (EST) Received: by ozlabs.org (Postfix) id 8B617B70C7; Thu, 22 Jul 2010 23:07:56 +1000 (EST) Delivered-To: linuxppc-dev@ozlabs.org X-Greylist: delayed 958 seconds by postgrey-1.32 at bilbo; Thu, 22 Jul 2010 23:07:56 EST Received: from mxout1.idt.com (mxout1.idt.com [157.165.5.25]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mxout1.idt.com", Issuer "idt.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 2F3FAB70C6 for ; Thu, 22 Jul 2010 23:07:56 +1000 (EST) Received: from mail.idt.com (localhost [127.0.0.1]) by mxout1.idt.com (8.13.1/8.13.1) with ESMTP id o6MCpDEr006423; Thu, 22 Jul 2010 05:51:13 -0700 Received: from corpml2.corp.idt.com (corpml2.corp.idt.com [157.165.140.26]) by mail.idt.com (8.13.8/8.13.8) with ESMTP id o6MCpCMq025472; Thu, 22 Jul 2010 05:51:12 -0700 (PDT) Received: from corpvpnfw (localhost [127.0.0.1]) by corpml2.corp.idt.com (8.11.7p1+Sun/8.11.7) with SMTP id o6MCpAG18873; Thu, 22 Jul 2010 05:51:10 -0700 (PDT) Received: from atanerk.tundra.com ([10.1.0.17]) by corpvpnfw; Thu, 22 Jul 2010 12:51:02 +0000 (GMT) Received: from tomkin.tundra.com (tomkin [10.1.0.2]) by atanerk.tundra.com (8.13.6/8.13.6) with ESMTP id o6MCowOF027041; Thu, 22 Jul 2010 08:50:58 -0400 (EDT) Received: from tomkin.tundra.com (localhost.localdomain [127.0.0.1]) by tomkin.tundra.com (8.13.1/8.13.1) with ESMTP id o6LGmTAN025006; Wed, 21 Jul 2010 12:48:29 -0400 Received: (from abounine@localhost) by tomkin.tundra.com (8.13.1/8.13.1/Submit) id o6LGlFZt024978; Wed, 21 Jul 2010 12:47:15 -0400 From: Alexandre Bounine To: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org Subject: [PATCH] RapidIO,powerpc/85xx: remove MCSR_MASK in fsl_rio Date: Wed, 21 Jul 2010 12:46:50 -0400 Message-Id: <1279730810-24926-1-git-send-email-alexandre.bounine@idt.com> X-Mailer: git-send-email 1.7.0.5 X-Scanned-By: MIMEDefang 2.43 Cc: Alexandre Bounine X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Fixes compile problem caused by MCSR_MASK removal from book-E definitions. Signed-off-by: Alexandre Bounine Cc: Kumar Gala Cc: Grant Likely Cc: Matt Porter --- arch/powerpc/sysdev/fsl_rio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c index 30e1626..c58df58 100644 --- a/arch/powerpc/sysdev/fsl_rio.c +++ b/arch/powerpc/sysdev/fsl_rio.c @@ -245,7 +245,7 @@ static int (*saved_mcheck_exception)(struct pt_regs *regs); static int fsl_rio_mcheck_exception(struct pt_regs *regs) { const struct exception_table_entry *entry = NULL; - unsigned long reason = (mfspr(SPRN_MCSR) & MCSR_MASK); + unsigned long reason = mfspr(SPRN_MCSR); if (reason & MCSR_BUS_RBERR) { reason = in_be32((u32 *)(rio_regs_win + RIO_LTLEDCSR));