From patchwork Wed Jul 2 09:06:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 4464381 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B155DBEEAA for ; Wed, 2 Jul 2014 09:13:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DCE38202E5 for ; Wed, 2 Jul 2014 09:13:10 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2189E20259 for ; Wed, 2 Jul 2014 09:13:10 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X2GYQ-0000GW-TT; Wed, 02 Jul 2014 09:10:14 +0000 Received: from mail-pa0-x22b.google.com ([2607:f8b0:400e:c03::22b]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X2GYN-0007U3-TV for linux-arm-kernel@lists.infradead.org; Wed, 02 Jul 2014 09:10:12 +0000 Received: by mail-pa0-f43.google.com with SMTP id lf10so12228559pab.30 for ; Wed, 02 Jul 2014 02:09:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=WWMTCShi8zP1YuY1oDD1JLMvSIwd5m/E9Cx8Xox45GE=; b=EklPwJvYlYikBht3RI/jCd0TB7UK0F1kea/PCTIwZWs1fi+bR+bouYQCZP8RqqCv/y Grce9k99KSNSKuyugcWQKJsE3FJ3oEMoiXHk9Svn2KGt1qbVjtntGov5zz3EDD3aurUH zTQ+HQ9iITOeelz1VN+fdxlndFleXVCQGpETAVRr9n8RhGyusTdzQbxHBLFI9+WGdYBp pg5zvZC28MCZjqLjDc1nveArDa6HhKXVLKnqtsM2UNOPq6zdckEN25mcRgdRhd9mtGeD EdTIhsFzsoXLhEJutyrqjND3rFS4biOzx+tD0H5s0zWctz3K2AlHJlOYHzbDroyq0+vK nVPw== X-Received: by 10.68.203.132 with SMTP id kq4mr144326pbc.12.1404292190194; Wed, 02 Jul 2014 02:09:50 -0700 (PDT) Received: from linaro.sisodomain.com ([14.140.216.146]) by mx.google.com with ESMTPSA id xh10sm127516382pac.24.2014.07.02.02.09.45 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Jul 2014 02:09:49 -0700 (PDT) From: Sachin Kamat To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/1] arm: perf: Fix build error Date: Wed, 2 Jul 2014 14:36:16 +0530 Message-Id: <1404291976-24662-1-git-send-email-sachin.kamat@samsung.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140702_021011_981435_71923259 X-CRM114-Status: GOOD ( 10.96 ) X-Spam-Score: -0.7 (/) Cc: Mark Rutland , linux@arm.linux.org.uk, a.p.zijlstra@chello.nl, Will Deacon , acme@kernel.org, mingo@redhat.com, paulus@samba.org, spk.linux@gmail.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add missing semicolon to fix the following build errors introduced by commit 6f73e8ababdd ("arm: perf: clean up PMU names"): arch/arm/kernel/perf_event_v6.c:498:2: error: expected ‘;’ before ‘return’ arch/arm/kernel/perf_event_v6.c:505:2: error: expected ‘;’ before ‘return’ arch/arm/kernel/perf_event_v6.c:512:2: error: expected ‘;’ before ‘return’ Signed-off-by: Sachin Kamat Cc: Mark Rutland Cc: Will Deacon --- arch/arm/kernel/perf_event_v6.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/kernel/perf_event_v6.c b/arch/arm/kernel/perf_event_v6.c index 62227d11e874..abfeb04f3213 100644 --- a/arch/arm/kernel/perf_event_v6.c +++ b/arch/arm/kernel/perf_event_v6.c @@ -494,21 +494,21 @@ static void armv6pmu_init(struct arm_pmu *cpu_pmu) static int armv6_1136_pmu_init(struct arm_pmu *cpu_pmu) { armv6pmu_init(cpu_pmu); - cpu_pmu->name = "armv6_1136" + cpu_pmu->name = "armv6_1136"; return 0; } static int armv6_1156_pmu_init(struct arm_pmu *cpu_pmu) { armv6pmu_init(cpu_pmu); - cpu_pmu->name = "armv6_1156" + cpu_pmu->name = "armv6_1156"; return 0; } static int armv6_1176_pmu_init(struct arm_pmu *cpu_pmu) { armv6pmu_init(cpu_pmu); - cpu_pmu->name = "armv6_1176" + cpu_pmu->name = "armv6_1176"; return 0; }