From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EB50C2BA19 for ; Tue, 21 Apr 2020 03:21:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 02BB42084D for ; Tue, 21 Apr 2020 03:21:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587439286; bh=xEmUHAOoyZcRhEoFa4R3C3VggYvh9vMG39wtbPGgH1s=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=hJ1tBFFAlLLkIm0NQUCnYz/Wivbojagmf27/WW4qq4WbSPTVUBNuJLOoZ7RX1ZJpD eMgfWvldeAjdsIPvflnf8MP+1Q9soKdb1FTbeiHOixuH46hl0Giapmbrjp5cq9qHuU MtYj0VVzAvPf9LJfPpmUeBzGRe/rMl2aUdycVtew= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726628AbgDUDVZ (ORCPT ); Mon, 20 Apr 2020 23:21:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:38804 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725989AbgDUDVZ (ORCPT ); Mon, 20 Apr 2020 23:21:25 -0400 Received: from dragon (80.251.214.228.16clouds.com [80.251.214.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 11A86206F9; Tue, 21 Apr 2020 03:21:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587439285; bh=xEmUHAOoyZcRhEoFa4R3C3VggYvh9vMG39wtbPGgH1s=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Yd21Ne0fDGlsG9hDF1efk/I564yGFpzgFZFsP1yBrZAVAz5nMXJ49sQTAqfnuRauF K4AIlzKFC8Fm2XVUUY2lL+xgOjxMvqxl0awzBrCWD/sUH3aEpbyM/4y0rlcmf8VLqu bTJ3cC3JKi5NI3xiVwEJxcK++wkD7P9AmlbIh+EE= Date: Tue, 21 Apr 2020 11:21:17 +0800 From: Shawn Guo To: Ahmad Fatoum Cc: Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Lucas Stach , Rouven Czerwinski , stable@vger.kernel.org, Clemens Gruber , Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ARM: imx: provide v7_cpu_resume() only on ARM_CPU_SUSPEND=y Message-ID: <20200421032116.GD8571@dragon> References: <20200323081933.31497-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200323081933.31497-1-a.fatoum@pengutronix.de> User-Agent: Mutt/1.9.4 (2018-02-28) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Mon, Mar 23, 2020 at 09:19:33AM +0100, Ahmad Fatoum wrote: > 512a928affd5 ("ARM: imx: build v7_cpu_resume() unconditionally") > introduced an unintended linker error for i.MX6 configurations that have > ARM_CPU_SUSPEND=n which can happen if neither CONFIG_PM, CONFIG_CPU_IDLE, > nor ARM_PSCI_FW are selected. > > Fix this by having v7_cpu_resume() compiled only when cpu_resume() it > calls is available as well. > > The C declaration for the function remains unguarded to avoid future code > inadvertently using a stub and introducing a regression to the bug the > original commit fixed. > > Cc: > Fixes: 512a928affd5 ("ARM: imx: build v7_cpu_resume() unconditionally") > Reported-by: Clemens Gruber > Signed-off-by: Ahmad Fatoum Applied, thanks.