From patchwork Tue Sep 6 05:48:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 3873 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 5E0B123E54 for ; Tue, 6 Sep 2011 05:48:11 +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 546EBA185D1 for ; Tue, 6 Sep 2011 05:48:11 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id 18so5878355fxd.11 for ; Mon, 05 Sep 2011 22:48:11 -0700 (PDT) Received: by 10.223.5.139 with SMTP id 11mr998592fav.138.1315288091202; Mon, 05 Sep 2011 22:48:11 -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 m8cs83864lab; Mon, 5 Sep 2011 22:48:11 -0700 (PDT) Received: by 10.68.4.105 with SMTP id j9mr8349932pbj.72.1315288089639; Mon, 05 Sep 2011 22:48:09 -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 6si9013893pbc.42.2011.09.05.22.48.08 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 05 Sep 2011 22:48:09 -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 33so11281599pzk.32 for ; Mon, 05 Sep 2011 22:48:08 -0700 (PDT) Received: by 10.68.33.231 with SMTP id u7mr8772402pbi.292.1315288088722; Mon, 05 Sep 2011 22:48:08 -0700 (PDT) Received: from localhost.localdomain ([114.216.158.82]) by mx.google.com with ESMTPS id x6sm27429399pba.5.2011.09.05.22.48.04 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 05 Sep 2011 22:48:08 -0700 (PDT) From: Shawn Guo To: Russell King Cc: linux-arm-kernel@lists.infradead.org, patches@linaro.org, Shawn Guo Subject: [PATCH v2 2/2] ARM: smp_scu: remove __init annotation from scu_enable() Date: Tue, 6 Sep 2011 13:48:27 +0800 Message-Id: <1315288107-14689-3-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1315288107-14689-1-git-send-email-shawn.guo@linaro.org> References: <1315288107-14689-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;