From patchwork Mon Dec 26 13:47:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Miao X-Patchwork-Id: 5977 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 4513F23E07 for ; Mon, 26 Dec 2011 13:48:07 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id 23422A18450 for ; Mon, 26 Dec 2011 13:48:07 +0000 (UTC) Received: by eaac11 with SMTP id c11so9057454eaa.11 for ; Mon, 26 Dec 2011 05:48:07 -0800 (PST) Received: by 10.205.120.148 with SMTP id fy20mr5815996bkc.125.1324907286887; Mon, 26 Dec 2011 05:48:06 -0800 (PST) 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.205.82.144 with SMTP id ac16cs149381bkc; Mon, 26 Dec 2011 05:48:06 -0800 (PST) Received: by 10.220.155.147 with SMTP id s19mr14523684vcw.14.1324907284930; Mon, 26 Dec 2011 05:48:04 -0800 (PST) Received: from mail-vw0-f50.google.com (mail-vw0-f50.google.com [209.85.212.50]) by mx.google.com with ESMTPS id a12si4766129vcp.83.2011.12.26.05.48.04 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 26 Dec 2011 05:48:04 -0800 (PST) Received-SPF: pass (google.com: domain of eric.y.miao@gmail.com designates 209.85.212.50 as permitted sender) client-ip=209.85.212.50; Authentication-Results: mx.google.com; spf=pass (google.com: domain of eric.y.miao@gmail.com designates 209.85.212.50 as permitted sender) smtp.mail=eric.y.miao@gmail.com; dkim=pass (test mode) header.i=@gmail.com Received: by vbbey12 with SMTP id ey12so11384957vbb.37 for ; Mon, 26 Dec 2011 05:48:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:content-type :content-transfer-encoding; bh=uqTiBdKHzW3N8UphnMYqrWiq6P3cAXsPH3i8m8/68Rg=; b=OuubMDsUXgfSNhmZOA9X0CTvQ4FrF5qi6qr7S7vgbFtxwh+/BeNbw7CE+fhisPyL1+ A1XyUNxYForua4cK9Xy7pW/bkRF5aCC0yqfHdY+X0SACPztvDUJcsWC/ET0EgRAWR5no 1EtE+wrljO810AMTPuBrtmLWdH3hqM5oR28Nk= Received: by 10.52.20.35 with SMTP id k3mr13341078vde.34.1324907284284; Mon, 26 Dec 2011 05:48:04 -0800 (PST) MIME-Version: 1.0 Sender: eric.y.miao@gmail.com Received: by 10.52.110.99 with HTTP; Mon, 26 Dec 2011 05:47:43 -0800 (PST) In-Reply-To: <1324526101-7140-1-git-send-email-eric.miao@linaro.org> References: <1324526101-7140-1-git-send-email-eric.miao@linaro.org> From: Eric Miao Date: Mon, 26 Dec 2011 21:47:43 +0800 X-Google-Sender-Auth: PDJuMsTw0vLWqu3CR8Q05IHxxjo Message-ID: Subject: Fwd: [PATCH] ARM: imx6q: resume PL310 only when CACHE_L2X0 defined To: patches@linaro.org ---------- Forwarded message ---------- From: Eric Miao Date: Thu, Dec 22, 2011 at 11:55 AM Subject: [PATCH] ARM: imx6q: resume PL310 only when CACHE_L2X0 defined To: linux-arm-kernel Cc: Eric Miao , Lothar Waßmann , Shawn Guo Original patch from Lothar Waßmann, this patch fixes a building error when CONFIG_CACHE_L2X0 is not defined. Cc: Lothar Waßmann Cc: Shawn Guo Signed-off-by: Eric Miao ---  arch/arm/mach-imx/head-v7.S |   13 +++++++++----  1 files changed, 9 insertions(+), 4 deletions(-) -- 1.7.5.4 diff --git a/arch/arm/mach-imx/head-v7.S b/arch/arm/mach-imx/head-v7.S index a59cae7..cec23a8 100644 --- a/arch/arm/mach-imx/head-v7.S +++ b/arch/arm/mach-imx/head-v7.S @@ -80,6 +80,7 @@ ENDPROC(v7_secondary_startup)        .data        .align +#ifdef CONFIG_CACHE_L2X0        .macro  pl310_resume        ldr     r2, phys_l2x0_saved_regs        ldr     r0, [r2, #L2X0_R_PHY_BASE]      @ get physical base of l2x0 @@ -89,13 +90,17 @@ ENDPROC(v7_secondary_startup)        str     r1, [r0, #L2X0_CTRL]            @ re-enable L2        .endm +       .globl  phys_l2x0_saved_regs +phys_l2x0_saved_regs: +        .long   0 +#else +       .macro  pl310_resume +       .endm +#endif +  ENTRY(v7_cpu_resume)        bl      v7_invalidate_l1        pl310_resume        b       cpu_resume  ENDPROC(v7_cpu_resume) - -       .globl  phys_l2x0_saved_regs -phys_l2x0_saved_regs: -        .long   0  #endif