diff options
author | Anton Ivanov <anton.ivanov@cambridgegreys.com> | 2023-09-21 15:34:44 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-02-05 20:14:30 +0000 |
commit | 976c46e6964ceb70e0786d5491665c65a24f48a3 (patch) | |
tree | 8710b466caf7d5f61417cfc8fa1a4e216a3219fe /arch/um/kernel/process.c | |
parent | 029479d4f1bb9f79f00c1054d26876322abe676d (diff) |
um: Fix naming clash between UML and scheduler
[ 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 <anton.ivanov@cambridgegreys.com>
Reviewed-by: Peter Lafreniere <peter@n8pjl.ca>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch/um/kernel/process.c')
-rw-r--r-- | arch/um/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index 106b7da2f8d6..6daffb9d8a8d 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c @@ -220,7 +220,7 @@ void arch_cpu_idle(void) um_idle_sleep(); } -int __cant_sleep(void) { +int __uml_cant_sleep(void) { return in_atomic() || irqs_disabled() || in_interrupt(); /* Is in_interrupt() really needed? */ } |