From patchwork Tue Aug 30 07:40:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 3781 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 6C32023F18 for ; Tue, 30 Aug 2011 07:40:14 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 5AC13A18657 for ; Tue, 30 Aug 2011 07:40:14 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id 18so7657744fxd.11 for ; Tue, 30 Aug 2011 00:40:14 -0700 (PDT) Received: by 10.223.62.73 with SMTP id w9mr1762644fah.138.1314690014237; Tue, 30 Aug 2011 00:40:14 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.11.8 with SMTP id m8cs124442lab; Tue, 30 Aug 2011 00:40:14 -0700 (PDT) Received: by 10.236.176.67 with SMTP id a43mr30859556yhm.54.1314690012998; Tue, 30 Aug 2011 00:40:12 -0700 (PDT) Received: from mail-pz0-f45.google.com (mail-pz0-f45.google.com [209.85.210.45]) by mx.google.com with ESMTPS id k2si9615476pbd.5.2011.08.30.00.40.11 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 30 Aug 2011 00:40:12 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.210.45 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) client-ip=209.85.210.45; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.45 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) smtp.mail=shawn.guo@linaro.org Received: by mail-pz0-f45.google.com with SMTP id 33so13078360pzk.32 for ; Tue, 30 Aug 2011 00:40:11 -0700 (PDT) Received: by 10.142.239.10 with SMTP id m10mr2857399wfh.27.1314690011884; Tue, 30 Aug 2011 00:40:11 -0700 (PDT) Received: from localhost.localdomain ([117.82.25.167]) by mx.google.com with ESMTPS id m2sm521635pbq.12.2011.08.30.00.40.06 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 30 Aug 2011 00:40:11 -0700 (PDT) From: Shawn Guo To: Russell King Cc: linux-arm-kernel@lists.infradead.org, patches@linaro.org, Shawn Guo Subject: [PATCH 3/3] ARM: smp_scu: remove __init annotation from scu_enable() Date: Tue, 30 Aug 2011 15:40:17 +0800 Message-Id: <1314690017-17590-4-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1314690017-17590-1-git-send-email-shawn.guo@linaro.org> References: <1314690017-17590-1-git-send-email-shawn.guo@linaro.org> When Cortex-A9 MPCore resumes from Dormant or Shutdown modes, SCU needs to be re-enabled. This patch removes __init annotation from function scu_enable(), so that platform resume procedure can call it to re-enable SCU. Signed-off-by: Shawn Guo --- arch/arm/kernel/smp_scu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/kernel/smp_scu.c b/arch/arm/kernel/smp_scu.c index 79ed5e7..5b6d536 100644 --- a/arch/arm/kernel/smp_scu.c +++ b/arch/arm/kernel/smp_scu.c @@ -33,7 +33,7 @@ unsigned int __init scu_get_core_count(void __iomem *scu_base) /* * Enable the SCU */ -void __init scu_enable(void __iomem *scu_base) +void scu_enable(void __iomem *scu_base) { u32 scu_ctrl;