From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AACEB12AAFA; Wed, 24 Jan 2024 14:29:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706106597; cv=none; b=mSCUgiogPwLkgA15A3RAoo386bZ4e14M2H3RSx+/7nKu4EnPRPf92eoIBpBeYSNnNxWfG0s5Jou8D0c4i8M7SNqJTcESmvgiV4qt4aac2NXAWAIOwQRd2rJwkW5kmHS+DdaTtpkBpU/n11Q/Gfck+Tb0TFlD837oG56LpJfTPVE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706106597; c=relaxed/simple; bh=ri610qhq69wqJ2vXRJpKaI7Fc6roOtH5CYi/fFlKI6A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=APCzMWkddhVVOMr2x1nmuvok4v0AS0i5iqKWYwXP8T1M9MfTESlAOV70ZRcFTwtMuvwgsH1kK5XAQsTCnsewLCHnO0uWw9Hs71nL++dcLfH98fjU8+NNSn2uuxXi6cNTlfcFsdziAaDcEE6pbWCnz9KVlYwNxxCdLqJV11PR2xU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FUh16onV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FUh16onV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3BF5C43399; Wed, 24 Jan 2024 14:29:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706106597; bh=ri610qhq69wqJ2vXRJpKaI7Fc6roOtH5CYi/fFlKI6A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FUh16onVNI7rICjslpdCIQMiJYIVbtZXhHYb69rn9U4/M+V1mT+3VAzR+mTg6n+9F LzEOFAEHHIbS7dqf7H/50gIXje/XQ6gaBOe68upfyjkxfgGXzGdj/wXoe4+bb7s0Dz tn0UAYOI1JdrkUwLXG/PrVmKJ4053rH+Oy70aOH/ho7sTq4qy/9/QganM6BJc6cspu LlpJTbszHMM42UJKQLtEzqX/ICcOEPr4yQdh1tB+RZFZgSn9DwHiJ8L2ucHuavCKGm RS6eX0KaoPFggurImOHmizCv+3+ztmqEJFTmv1Wu+7aGeZAcRlw41HzL687JZ7iOPR eCFJoXsnolzsg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Anton Ivanov , Peter Lafreniere , Richard Weinberger , Sasha Levin , johannes@sipsolutions.net, benjamin@sipsolutions.net, linux-um@lists.infradead.org Subject: [PATCH AUTOSEL 6.1 2/9] um: Fix naming clash between UML and scheduler Date: Wed, 24 Jan 2024 09:29:32 -0500 Message-ID: <20240124142949.1283818-2-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240124142949.1283818-1-sashal@kernel.org> References: <20240124142949.1283818-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.74 Content-Transfer-Encoding: 8bit From: Anton Ivanov [ Upstream commit 541d4e4d435c8b9bfd29f70a1da4a2db97794e0a ] __cant_sleep was already used and exported by the scheduler. The name had to be changed to a UML specific one. Signed-off-by: Anton Ivanov Reviewed-by: Peter Lafreniere Signed-off-by: Richard Weinberger Signed-off-by: Sasha Levin --- arch/um/include/shared/kern_util.h | 2 +- arch/um/kernel/process.c | 2 +- arch/um/os-Linux/helper.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/um/include/shared/kern_util.h b/arch/um/include/shared/kern_util.h index d8b8b4f07e42..444bae755b16 100644 --- a/arch/um/include/shared/kern_util.h +++ b/arch/um/include/shared/kern_util.h @@ -50,7 +50,7 @@ extern void do_uml_exitcalls(void); * Are we disallowed to sleep? Used to choose between GFP_KERNEL and * GFP_ATOMIC. */ -extern int __cant_sleep(void); +extern int __uml_cant_sleep(void); extern int get_current_pid(void); extern int copy_from_user_proc(void *to, void *from, int size); extern char *uml_strdup(const char *string); diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index 010bc422a09d..a351c87db248 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c @@ -220,7 +220,7 @@ void arch_cpu_idle(void) raw_local_irq_enable(); } -int __cant_sleep(void) { +int __uml_cant_sleep(void) { return in_atomic() || irqs_disabled() || in_interrupt(); /* Is in_interrupt() really needed? */ } diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c index b459745f52e2..3cb8ac63be6e 100644 --- a/arch/um/os-Linux/helper.c +++ b/arch/um/os-Linux/helper.c @@ -46,7 +46,7 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv) unsigned long stack, sp; int pid, fds[2], ret, n; - stack = alloc_stack(0, __cant_sleep()); + stack = alloc_stack(0, __uml_cant_sleep()); if (stack == 0) return -ENOMEM; @@ -70,7 +70,7 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv) data.pre_data = pre_data; data.argv = argv; data.fd = fds[1]; - data.buf = __cant_sleep() ? uml_kmalloc(PATH_MAX, UM_GFP_ATOMIC) : + data.buf = __uml_cant_sleep() ? uml_kmalloc(PATH_MAX, UM_GFP_ATOMIC) : uml_kmalloc(PATH_MAX, UM_GFP_KERNEL); pid = clone(helper_child, (void *) sp, CLONE_VM, &data); if (pid < 0) { @@ -121,7 +121,7 @@ int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags, unsigned long stack, sp; int pid, status, err; - stack = alloc_stack(0, __cant_sleep()); + stack = alloc_stack(0, __uml_cant_sleep()); if (stack == 0) return -ENOMEM; -- 2.43.0