diff options
| author | Anton Ivanov <anton.ivanov@cambridgegreys.com> | 2023-09-21 15:34:44 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2024-01-04 21:22:27 +0100 |
| commit | 541d4e4d435c8b9bfd29f70a1da4a2db97794e0a (patch) | |
| tree | b36440cd4fcaa3c00d5b1dec55af629429471746 /arch/um/os-Linux | |
| parent | 32253f00ac8a8073bf6db4bfe9d6511cc93c4aef (diff) | |
| download | linux-stable-541d4e4d435c8b9bfd29f70a1da4a2db97794e0a.tar.gz linux-stable-541d4e4d435c8b9bfd29f70a1da4a2db97794e0a.tar.bz2 linux-stable-541d4e4d435c8b9bfd29f70a1da4a2db97794e0a.zip | |
um: Fix naming clash between UML and scheduler
__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>
Diffstat (limited to 'arch/um/os-Linux')
| -rw-r--r-- | arch/um/os-Linux/helper.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |