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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 706F4C3DA40 for ; Mon, 19 Jun 2023 10:59:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232453AbjFSK7Y (ORCPT ); Mon, 19 Jun 2023 06:59:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232434AbjFSK7A (ORCPT ); Mon, 19 Jun 2023 06:59:00 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D7B61BFE for ; Mon, 19 Jun 2023 03:57:47 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2A1EF60670 for ; Mon, 19 Jun 2023 10:57:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3291CC433AB; Mon, 19 Jun 2023 10:57:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1687172266; bh=Ztc0/YyUKCxv2oxuyl++E4/FbJR0kBP9C58Zqb5dEws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OjhbfeFJoH3wqzErojfT8A9MO9W6hKITBAl7LlvpY/QqVrPpOheYD4hAyEyEXz0yi VExczcpyi+ywoekw06Qch8q1KrBdB7RVF+BP5qeToHEfrRNGZtRsBYUtp4shWXqWA5 7AF12SCxRg8byrTPgOmubJL+uSkWJW2rzgREWSpI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Randy Dunlap , Johannes Berg , Richard Weinberger Subject: [PATCH 5.10 89/89] um: Fix build w/o CONFIG_PM_SLEEP Date: Mon, 19 Jun 2023 12:31:17 +0200 Message-ID: <20230619102142.350713787@linuxfoundation.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230619102138.279161276@linuxfoundation.org> References: <20230619102138.279161276@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Johannes Berg commit 1fb1abc83636f5329c26cd29f0f19f3faeb697a5 upstream. uml_pm_wake() is unconditionally called from the SIGUSR1 wakeup handler since that's in the userspace portion of UML, and thus a bit tricky to ifdef out. Since pm_system_wakeup() can always be called (but may be an empty inline), also simply always have uml_pm_wake() to fix the build. Reported-by: Randy Dunlap Acked-by: Randy Dunlap # build-tested Signed-off-by: Johannes Berg Signed-off-by: Richard Weinberger Signed-off-by: Greg Kroah-Hartman --- arch/um/kernel/um_arch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c @@ -387,12 +387,12 @@ void text_poke_sync(void) { } -#ifdef CONFIG_PM_SLEEP void uml_pm_wake(void) { pm_system_wakeup(); } +#ifdef CONFIG_PM_SLEEP static int init_pm_wake_signal(void) { /*