| Message ID | 1401182297-10347-1-git-send-email-christoffer.dall@linaro.org |
|---|---|
| State | Accepted |
| Commit | d6d7a95c1bdba370e2249efdecfab712c10cfc9b |
| Headers | show
Return-Path: <patchwork-forward+bncBCAJ5U7H64CRBX5RSGOAKGQEVVXBLGY@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f197.google.com (mail-ig0-f197.google.com [209.85.213.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 10A622066E for <linaro@patches.linaro.org>; Tue, 27 May 2014 09:20:31 +0000 (UTC) Received: by mail-ig0-f197.google.com with SMTP id hn18sf2900650igb.4 for <linaro@patches.linaro.org>; Tue, 27 May 2014 02:20:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id:cc :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=pMYr6PcIrkTDi8Iof4xnNyZufV6UMtRdu2yodCATbcE=; b=g2Gwrcgl9I1lZlU3OEIU094PvFVhzy/swesdWCty8k8Du+2dM7uIglfOS2JNg+hGex HxotMcXCdtzaBNNDB7bn4iWA00M0y7Go5N+HTB58QzwPWAsEnoCqW4IHduvpt78uS1yl jq1Z68eVe63GLokwfmzSqc7hoREHdncqpY3qEFoiG0mzXdPbrcRUnA3lnzOyHd1SCVn3 ++XzH+DOuPVkQ9Ib/w8xmJV/QqbPZQfEcEpQpYfCNlcLSXb6345CVytC4f1tf7T9uOxZ s+0F5t+iwq1qMa0kcYvv4ql8/FQHTEOFhBEuKyTauyEOYInva5JDIOIxMVVDC2f7tGpk xdPw== X-Gm-Message-State: ALoCoQkCaotisimJ8LKvYw0gXuk8yeNu75rLP7n6aLjquAQsl9kkZxV3dAsd5CFm43uNzonaVcQM X-Received: by 10.42.19.73 with SMTP id a9mr10647435icb.31.1401182431470; Tue, 27 May 2014 02:20:31 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.84.72 with SMTP id k66ls2729982qgd.96.gmail; Tue, 27 May 2014 02:20:31 -0700 (PDT) X-Received: by 10.220.10.2 with SMTP id n2mr26070130vcn.26.1401182431330; Tue, 27 May 2014 02:20:31 -0700 (PDT) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by mx.google.com with ESMTPS id fj8si7759273vdc.35.2014.05.27.02.20.31 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 27 May 2014 02:20:31 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.180 as permitted sender) client-ip=209.85.128.180; Received: by mail-ve0-f180.google.com with SMTP id db12so10407993veb.11 for <patchwork-forward@linaro.org>; Tue, 27 May 2014 02:20:31 -0700 (PDT) X-Received: by 10.52.175.69 with SMTP id by5mr21686952vdc.16.1401182431231; Tue, 27 May 2014 02:20:31 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp103555vcb; Tue, 27 May 2014 02:20:30 -0700 (PDT) X-Received: by 10.140.20.117 with SMTP id 108mr38146936qgi.37.1401182430791; Tue, 27 May 2014 02:20:30 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id g2si16538591qaf.76.2014.05.27.02.20.30 for <patch@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 May 2014 02:20:30 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; 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 1WpDX4-00049t-CN; Tue, 27 May 2014 09:18:54 +0000 Received: from mail-la0-f45.google.com ([209.85.215.45]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WpDX1-00041i-1h for linux-arm-kernel@lists.infradead.org; Tue, 27 May 2014 09:18:51 +0000 Received: by mail-la0-f45.google.com with SMTP id gl10so6355087lab.18 for <linux-arm-kernel@lists.infradead.org>; Tue, 27 May 2014 02:18:26 -0700 (PDT) X-Received: by 10.112.89.200 with SMTP id bq8mr779359lbb.88.1401182306154; Tue, 27 May 2014 02:18:26 -0700 (PDT) Received: from localhost.localdomain (188-178-240-98-static.dk.customer.tdc.net. [188.178.240.98]) by mx.google.com with ESMTPSA id zx3sm14610943lbc.2.2014.05.27.02.18.22 for <multiple recipients> (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 27 May 2014 02:18:24 -0700 (PDT) From: Christoffer Dall <christoffer.dall@linaro.org> To: linux-arm-kernel@lists.infradead.org, Paolo Bonzini <pbonzini@redhat.com>, Gleb Natapov <gleb@kernel.org> Subject: [PATCH] arm: Fix compile warning for psci Date: Tue, 27 May 2014 11:18:17 +0200 Message-Id: <1401182297-10347-1-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 1.8.5.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140527_021851_278162_C1A2CF22 X-CRM114-Status: GOOD ( 11.19 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.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 [209.85.215.45 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record Cc: Christoffer Dall <christoffer.dall@linaro.org>, Ashwin Chaugule <ashwin.chaugule@linaro.org>, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, Shawn Guo <shawn.guo@freescale.com> X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: <patchwork-forward.linaro.org> List-Unsubscribe: <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe>, <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> MIME-Version: 1.0 Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: christoffer.dall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.180 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit |
diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h index b93e34a..c25ef3e 100644 --- a/arch/arm/include/asm/psci.h +++ b/arch/arm/include/asm/psci.h @@ -41,7 +41,7 @@ extern struct smp_operations psci_smp_ops; int psci_init(void); bool psci_smp_available(void); #else -static inline int psci_init(void) { } +static inline int psci_init(void) { return 0; } static inline bool psci_smp_available(void) { return false; } #endif
Commit e71246a23acbc89e9cb4ebf1558d60e65733479f changes psci_init from a function returning a void to an int, but does not change the non CONFIG_ARM_PSCI implementation to return a value, which causes a compile warning. Just return 0. Cc: Ashwin Chaugule <ashwin.chaugule@linaro.org> Cc: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> --- Paolo, can you apply this directly after applying my pull request from yesterday? --- arch/arm/include/asm/psci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)