mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 22:02:02 +00:00
Code Issues Releases Wiki Activity

um: rename set_signals() to um_set_signals()

Browse source 
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: 68f5d3f3b6 ("um: add PCI over virtio emulation driver")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Johannes Berg 2021-08-31 09:11:15 +02:00 committed by Richard Weinberger
parent 5f8539e2ff
commit bbe33504d4
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/um/include/asm/irqflags.h
View file

@ -3,7 +3,7 @@
#define __UM_IRQFLAGS_H #define __UM_IRQFLAGS_H
extern int signals_enabled; extern int signals_enabled;
int set_signals(int enable); int um_set_signals(int enable);
void block_signals(void); void block_signals(void);
void unblock_signals(void); void unblock_signals(void);
@ -16,7 +16,7 @@ static inline unsigned long arch_local_save_flags(void)
#define arch_local_irq_restore arch_local_irq_restore #define arch_local_irq_restore arch_local_irq_restore
static inline void arch_local_irq_restore(unsigned long flags) static inline void arch_local_irq_restore(unsigned long flags)
{ {
set_signals(flags); um_set_signals(flags);
} }
#define arch_local_irq_enable arch_local_irq_enable #define arch_local_irq_enable arch_local_irq_enable

2
arch/um/include/shared/longjmp.h
View file

@ -18,7 +18,7 @@ extern void longjmp(jmp_buf, int);
enable = *(volatile int *)&signals_enabled; \ enable = *(volatile int *)&signals_enabled; \
n = setjmp(*buf); \ n = setjmp(*buf); \
if(n != 0) \ if(n != 0) \
set_signals_trace(enable); \ um_set_signals_trace(enable); \
n; }) n; })
#endif #endif

4
arch/um/include/shared/os.h
View file

@ -238,8 +238,8 @@ extern void send_sigio_to_self(void);
extern int change_sig(int signal, int on); extern int change_sig(int signal, int on);
extern void block_signals(void); extern void block_signals(void);
extern void unblock_signals(void); extern void unblock_signals(void);
extern int set_signals(int enable); extern int um_set_signals(int enable);
extern int set_signals_trace(int enable); extern int um_set_signals_trace(int enable);
extern int os_is_signal_stack(void); extern int os_is_signal_stack(void);
extern void deliver_alarm(void); extern void deliver_alarm(void);
extern void register_pm_wake_signal(void); extern void register_pm_wake_signal(void);

2
arch/um/kernel/ksyms.c
View file

@ -6,7 +6,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <os.h> #include <os.h>
EXPORT_SYMBOL(set_signals); EXPORT_SYMBOL(um_set_signals);
EXPORT_SYMBOL(signals_enabled); EXPORT_SYMBOL(signals_enabled);
EXPORT_SYMBOL(os_stat_fd); EXPORT_SYMBOL(os_stat_fd);

6
arch/um/os-Linux/sigio.c
View file

@ -132,7 +132,7 @@ static void update_thread(void)
int n; int n;
char c; char c;
flags = set_signals_trace(0); flags = um_set_signals_trace(0);
CATCH_EINTR(n = write(sigio_private[0], &c, sizeof(c))); CATCH_EINTR(n = write(sigio_private[0], &c, sizeof(c)));
if (n != sizeof(c)) { if (n != sizeof(c)) {
printk(UM_KERN_ERR "update_thread : write failed, err = %d\n", printk(UM_KERN_ERR "update_thread : write failed, err = %d\n",
@ -147,7 +147,7 @@ static void update_thread(void)
goto fail; goto fail;
} }
set_signals_trace(flags); um_set_signals_trace(flags);
return; return;
fail: fail:
/* Critical section start */ /* Critical section start */
@ -161,7 +161,7 @@ static void update_thread(void)
close(write_sigio_fds[0]); close(write_sigio_fds[0]);
close(write_sigio_fds[1]); close(write_sigio_fds[1]);
/* Critical section end */ /* Critical section end */
set_signals_trace(flags); um_set_signals_trace(flags);
} }
int __add_sigio_fd(int fd) int __add_sigio_fd(int fd)

8
arch/um/os-Linux/signal.c
View file

@ -94,7 +94,7 @@ void sig_handler(int sig, struct siginfo *si, mcontext_t *mc)
sig_handler_common(sig, si, mc); sig_handler_common(sig, si, mc);
set_signals_trace(enabled); um_set_signals_trace(enabled);
} }
static void timer_real_alarm_handler(mcontext_t *mc) static void timer_real_alarm_handler(mcontext_t *mc)
@ -126,7 +126,7 @@ void timer_alarm_handler(int sig, struct siginfo *unused_si, mcontext_t *mc)
signals_active &= ~SIGALRM_MASK; signals_active &= ~SIGALRM_MASK;
set_signals_trace(enabled); um_set_signals_trace(enabled);
} }
void deliver_alarm(void) { void deliver_alarm(void) {
@ -348,7 +348,7 @@ void unblock_signals(void)
} }
} }
int set_signals(int enable) int um_set_signals(int enable)
{ {
int ret; int ret;
if (signals_enabled == enable) if (signals_enabled == enable)
@ -362,7 +362,7 @@ int set_signals(int enable)
return ret; return ret;
} }
int set_signals_trace(int enable) int um_set_signals_trace(int enable)
{ {
int ret; int ret;
if (signals_enabled == enable) if (signals_enabled == enable)