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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 26FF3C43215 for ; Fri, 22 Nov 2019 11:19:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F3E0820730 for ; Fri, 22 Nov 2019 11:19:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574421564; bh=dp73QOkVQ/Jseq2MJwYbtX0yp/ztpldpJHbUHCxBFkQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=H0rRHSM+b3cri/mg9FMACSrvBs18GAP3/Y+VKHGda+W5YEpNb3nBaxEtiLxX1ZUej 6KkXGmcU8h/0whfuP8Jj3k4QY53ZQ1to3kKx7p5q+S409An60oO4gm/cxT3CSVfc/I j7/ooY6Dsm5eL403xlf6hoRPpS6YAZBuIb+fv2Hk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729120AbfKVKsB (ORCPT ); Fri, 22 Nov 2019 05:48:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:56296 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729816AbfKVKsA (ORCPT ); Fri, 22 Nov 2019 05:48:00 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 2E8FF205C9; Fri, 22 Nov 2019 10:47:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574419679; bh=dp73QOkVQ/Jseq2MJwYbtX0yp/ztpldpJHbUHCxBFkQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IzD+GR/wNKI2FehRcMfSuRRBfncrXuq62A+2L/qJ6knQycjR4tu5Eqp2YVcI8w/Lx 5QyFVPkhVW89R08fYa/IPRYHW8aBhF9qkGvjpFyGKawx4acv2qK0DBIw6PCrq73S27 YUzlrrFGbinvvUdQeUZuYGzyGuarbxmcTKWWh5gw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Borislav Petkov , Lubomir Rintel , x86@kernel.org, Sasha Levin Subject: [PATCH 4.9 194/222] x86/olpc: Fix build error with CONFIG_MFD_CS5535=m Date: Fri, 22 Nov 2019 11:28:54 +0100 Message-Id: <20191122100916.251627216@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100830.874290814@linuxfoundation.org> References: <20191122100830.874290814@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Borislav Petkov [ Upstream commit fa112cf1e8bc693d5a666b1c479a2859c8b6e0f1 ] When building a 32-bit config which has the above MFD item as module but OLPC_XO1_PM is enabled =y - which is bool, btw - the kernel fails building with: ld: arch/x86/platform/olpc/olpc-xo1-pm.o: in function `xo1_pm_remove': /home/boris/kernel/linux/arch/x86/platform/olpc/olpc-xo1-pm.c:159: undefined reference to `mfd_cell_disable' ld: arch/x86/platform/olpc/olpc-xo1-pm.o: in function `xo1_pm_probe': /home/boris/kernel/linux/arch/x86/platform/olpc/olpc-xo1-pm.c:133: undefined reference to `mfd_cell_enable' make: *** [Makefile:1030: vmlinux] Error 1 Force MFD_CS5535 to y if OLPC_XO1_PM is enabled. Signed-off-by: Borislav Petkov Cc: Lubomir Rintel Cc: x86@kernel.org Link: http://lkml.kernel.org/r/20181005131750.GA5366@zn.tnic Signed-off-by: Sasha Levin --- arch/x86/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 1067f7668c4ee..80636caee07cc 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2614,8 +2614,7 @@ config OLPC config OLPC_XO1_PM bool "OLPC XO-1 Power Management" - depends on OLPC && MFD_CS5535 && PM_SLEEP - select MFD_CORE + depends on OLPC && MFD_CS5535=y && PM_SLEEP ---help--- Add support for poweroff and suspend of the OLPC XO-1 laptop. -- 2.20.1