From patchwork Tue Jun 28 13:37:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan Wu X-Patchwork-Id: 924772 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5SDcAS7032123 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 28 Jun 2011 13:38:31 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QbYUG-0001CI-K7; Tue, 28 Jun 2011 13:37:57 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QbYUG-0001Mw-7z; Tue, 28 Jun 2011 13:37:56 +0000 Received: from mail-wy0-f177.google.com ([74.125.82.177]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QbYUC-0001Me-K2 for linux-arm-kernel@lists.infradead.org; Tue, 28 Jun 2011 13:37:53 +0000 Received: by wyf23 with SMTP id 23so174149wyf.36 for ; Tue, 28 Jun 2011 06:37:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer; bh=dQT4+P6t3p6t7RkfQ3+R41mkW0GGjlDI8lXz2/XDqJQ=; b=FkD+bbXOCVhWdAA2qyn/DF726328hAubnq9A+2uylY+zkENGWh8L6EC/93CpV7pewi cSkyS4Drzo4eCJj544R+g/n1eHhWYf6ENEZ6dyUcv0GOSHPDLW0GbVCCQ5wN6Tv2nP4W mRc1KK6KMSq63Pgx3SitrpOR2OUi3QG8OFfRk= Received: by 10.216.69.205 with SMTP id n55mr6689374wed.35.1309268269451; Tue, 28 Jun 2011 06:37:49 -0700 (PDT) Received: from localhost ([83.141.95.158]) by mx.google.com with ESMTPS id k49sm130163weq.7.2011.06.28.06.37.47 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 28 Jun 2011 06:37:48 -0700 (PDT) From: Bryan Wu To: will.deacon@arm.com, ming.lei@canonical.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: automatically select OMAP3_PMU if we try to use perf on OMAP3 Date: Tue, 28 Jun 2011 21:37:45 +0800 Message-Id: <1309268265-2685-1-git-send-email-bryan.wu@canonical.com> X-Mailer: git-send-email 1.7.4.1 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110628_093752_906487_7067F715 X-CRM114-Status: GOOD ( 14.96 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.177 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (cooloney[at]gmail.com) 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 T_TO_NO_BRKTS_FREEMAIL T_TO_NO_BRKTS_FREEMAIL X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 28 Jun 2011 13:38:31 +0000 (UTC) For our Ubuntu kernel on OMAP4 machine, we need to enable OMAP3 as well as OMAP4. OMAP3_EMU has to be enabled manully to make CPU_HAS_PMU=y, which is required by perf. So this patch will select the OMAP3_EMU if ARCH_OMAP3 is enabled. Cc: Ming Lei Signed-off-by: Bryan Wu --- arch/arm/Kconfig | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2fd0911..53d0eba 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1084,10 +1084,10 @@ config XSCALE_PMU default y config CPU_HAS_PMU - depends on (CPU_V6 || CPU_V6K || CPU_V7 || XSCALE_PMU) && \ - (!ARCH_OMAP3 || OMAP3_EMU) + depends on CPU_V6 || CPU_V6K || CPU_V7 || XSCALE_PMU default y bool + select OMAP3_EMU if ARCH_OMAP3 config MULTI_IRQ_HANDLER bool