Received: from mail.onstor.com ([66.201.51.107]) by onstor-exch02.onstor.net with Microsoft SMTPSVC(6.0.3790.1830);
	 Thu, 21 Jun 2007 05:00:35 -0700
Received: from ftp.linux-mips.org ([194.74.144.162]) by mail.onstor.com with Microsoft SMTPSVC(6.0.3790.1830);
	 Thu, 21 Jun 2007 05:00:35 -0700
Received: from localhost.localdomain ([127.0.0.1]:64467 "EHLO
	ftp.linux-mips.org") by ftp.linux-mips.org with ESMTP
	id S20021494AbXFUMA2 (ORCPT <rfc822;dan.stein@onstor.com> + 1 other);
	Thu, 21 Jun 2007 13:00:28 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 21 Jun 2007 13:00:08 +0100 (BST)
Received: from dmz.mips-uk.com ([194.74.144.194]:19475 "EHLO dmz.mips-uk.com")
	by ftp.linux-mips.org with ESMTP id S20021467AbXFUMAG (ORCPT
	<rfc822;linux-mips@linux-mips.org>); Thu, 21 Jun 2007 13:00:06 +0100
Received: from internal-mx1 ([192.168.192.240] helo=ukservices1.mips.com)
	by dmz.mips-uk.com with esmtp (Exim 3.35 #1 (Debian))
	id 1I1LKX-0001U6-00
	for <linux-mips@linux-mips.org>; Thu, 21 Jun 2007 13:00:05 +0100
Received: from hendon.mips.com ([192.168.192.184] helo=localhost.localdomain)
	by ukservices1.mips.com with esmtp (Exim 3.36 #1 (Debian))
	id 1I1LKQ-0001Pd-01; Thu, 21 Jun 2007 12:59:58 +0100
From:	chris@mips.com
To:	linux-mips@linux-mips.org
Cc:	Chris Dearman <chris@mips.com>
Subject: [PATCH] Fix timer/performance interrupt detection
Date:	Thu, 21 Jun 2007 12:59:57 +0100
Message-Id: <1182427198884-git-send-email-chris@mips.com>
X-Mailer: git-send-email 1.4.3.GIT
In-Reply-To: <11824271984112-git-send-email-chris@mips.com>
References: <11824271984112-git-send-email-chris@mips.com>
X-MIPS-Technologies-UK-MailScanner: Found to be clean
X-MIPS-Technologies-UK-MailScanner-From: chris@mips.com
X-archive-position: 15494
X-ecartis-version: Ecartis v1.0.0
Sender:	linux-mips-bounce@linux-mips.org
Errors-to: linux-mips-bounce@linux-mips.org
X-original-sender: chris@mips.com
Precedence: bulk
X-list:	linux-mips
Return-Path: linux-mips-bounce@linux-mips.org
X-OriginalArrivalTime: 21 Jun 2007 12:00:35.0173 (UTC) FILETIME=[C67F1950:01C7B3FB]

From: Chris Dearman <chris@mips.com>

Signed-off-by: Chris Dearman <chris@mips.com>
---
 arch/mips/kernel/traps.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index b123364..3ea7863 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1372,12 +1372,12 @@ void __init per_cpu_trap_init(void)
 	 */
 	if (cpu_has_mips_r2) {
 		cp0_compare_irq = (read_c0_intctl () >> 29) & 7;
-		cp0_perfcount_irq = -1;
-	} else {
-		cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ;
 		cp0_perfcount_irq = (read_c0_intctl () >> 26) & 7;
-		if (cp0_perfcount_irq != cp0_compare_irq)
+		if (cp0_perfcount_irq == cp0_compare_irq)
 			cp0_perfcount_irq = -1;
+	} else {
+		cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ;
+		cp0_perfcount_irq = -1;
 	}
 
 #ifdef CONFIG_MIPS_MT_SMTC
-- 
1.4.4.3


