diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2021-08-31 09:11:15 +0200 |
|---|---|---|
| committer |   Richard Weinberger <richard@nod.at> | 2021-12-21 21:13:44 +0100 |
| commit | bbe33504d4a7fdab9011211e55e262c869b3f6cc (patch) | |
| tree | 0193a4a36c0547237588a649c77ed34e28d6cc08 /arch/um/include/shared/longjmp.h | |
| parent | um: fix ndelay/udelay defines (diff) | |
| download | linux-dev-bbe33504d4a7fdab9011211e55e262c869b3f6cc.tar.xz linux-dev-bbe33504d4a7fdab9011211e55e262c869b3f6cc.zip | |
um: rename set_signals() to um_set_signals()
Rename set_signals() as there's at least one driver that
uses the same name and can now be built on UM due to PCI
support, and thus we can get symbol conflicts.
Also rename set_signals_trace() to be consistent.
Reported-by: kernel test robot <lkp@intel.com>
Fixes: 68f5d3f3b654 ("um: add PCI over virtio emulation driver")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/include/shared/longjmp.h')
| -rw-r--r-- | arch/um/include/shared/longjmp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/include/shared/longjmp.h b/arch/um/include/shared/longjmp.h index bdb2869b72b3..8863319039f3 100644 --- a/arch/um/include/shared/longjmp.h +++ b/arch/um/include/shared/longjmp.h @@ -18,7 +18,7 @@ extern void longjmp(jmp_buf, int); enable = *(volatile int *)&signals_enabled; \ n = setjmp(*buf); \ if(n != 0) \ - set_signals_trace(enable); \ + um_set_signals_trace(enable); \ n; }) #endif |