Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752234AbbBSGPP (ORCPT ); Thu, 19 Feb 2015 01:15:15 -0500 Received: from mail-by2on0082.outbound.protection.outlook.com ([207.46.100.82]:33232 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751605AbbBSGOz (ORCPT ); Thu, 19 Feb 2015 01:14:55 -0500 From: To: CC: , , , Dinh Nguyen , Pratik Patel , Mathieu Poirier , Greg Kroah-Hartman , Will Deacon Subject: [RFC PATCH] arm: cti: fix up cti pmu build Date: Thu, 19 Feb 2015 00:09:45 -0600 Message-ID: <1424326185-31463-2-git-send-email-dinguyen@opensource.altera.com> X-Mailer: git-send-email 2.2.1 In-Reply-To: <1424326185-31463-1-git-send-email-dinguyen@opensource.altera.com> References: <1424326185-31463-1-git-send-email-dinguyen@opensource.altera.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [64.129.157.38] X-ClientProxiedBy: BLUPR08CA0047.namprd08.prod.outlook.com (10.141.200.27) To DM2PR0301MB1198.namprd03.prod.outlook.com (25.160.217.148) Authentication-Results: arm.linux.org.uk; dkim=none (message not signed) header.d=none; X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB1198; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5005003);SRVR:DM2PR0301MB1198; X-Forefront-PRVS: 0492FD61DD X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(122386002)(40100003)(50466002)(42186005)(47776003)(33646002)(110136001)(76176999)(66066001)(92566002)(46102003)(2950100001)(50226001)(50986999)(62966003)(19580395003)(19580405001)(77156002)(2351001)(229853001)(86362001)(575784001)(53416004)(86152002)(48376002)(87976001);DIR:OUT;SFP:1101;SCL:1;SRVR:DM2PR0301MB1198;H:linux-builds1.altera.com;FPR:;SPF:None;MLV:sfv;LANG:en; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB1198; X-OriginatorOrg: opensource.altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2015 06:14:52.0118 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB1198 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1845 Lines: 60 From: Dinh Nguyen commit "184901a06a36 ARM: removing support for etb/etm in "arch/arm/kernel/" removed arch/arm/include/asm/hardware/coresight.h then commit "a06ae8609b3d coresight: add CoreSight core layer framework" added include/linux/coresight.h Update cti.h to use thew new coresight.h and replace CS_LAR_KEY with CORESIGHT_UNLOCK. Signed-off-by: Dinh Nguyen Cc: Pratik Patel Cc: Mathieu Poirier Cc: Greg Kroah-Hartman Cc: Will Deacon --- arch/arm/include/asm/cti.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/cti.h b/arch/arm/include/asm/cti.h index 2381199..044fda8 100644 --- a/arch/arm/include/asm/cti.h +++ b/arch/arm/include/asm/cti.h @@ -2,7 +2,7 @@ #define __ASMARM_CTI_H #include -#include +#include /* The registers' definition is from section 3.2 of * Embedded Cross Trigger Revision: r0p0 @@ -142,7 +142,7 @@ static inline void cti_irq_ack(struct cti *cti) */ static inline void cti_unlock(struct cti *cti) { - __raw_writel(CS_LAR_KEY, cti->base + LOCKACCESS); + __raw_writel(CORESIGHT_UNLOCK, cti->base + LOCKACCESS); } /** @@ -154,6 +154,6 @@ static inline void cti_unlock(struct cti *cti) */ static inline void cti_lock(struct cti *cti) { - __raw_writel(~CS_LAR_KEY, cti->base + LOCKACCESS); + __raw_writel(~CORESIGHT_UNLOCK, cti->base + LOCKACCESS); } #endif -- 2.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/