Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Johannes Berg and committed by
Richard Weinberger
bbe33504 5f8539e2

+13 -13
+2 -2
arch/um/include/asm/irqflags.h
··· 3 3 #define __UM_IRQFLAGS_H 4 4 5 5 extern int signals_enabled; 6 - int set_signals(int enable); 6 + int um_set_signals(int enable); 7 7 void block_signals(void); 8 8 void unblock_signals(void); 9 9 ··· 16 16 #define arch_local_irq_restore arch_local_irq_restore 17 17 static inline void arch_local_irq_restore(unsigned long flags) 18 18 { 19 - set_signals(flags); 19 + um_set_signals(flags); 20 20 } 21 21 22 22 #define arch_local_irq_enable arch_local_irq_enable
+1 -1
arch/um/include/shared/longjmp.h
··· 18 18 enable = *(volatile int *)&signals_enabled; \ 19 19 n = setjmp(*buf); \ 20 20 if(n != 0) \ 21 - set_signals_trace(enable); \ 21 + um_set_signals_trace(enable); \ 22 22 n; }) 23 23 24 24 #endif
+2 -2
arch/um/include/shared/os.h
··· 238 238 extern int change_sig(int signal, int on); 239 239 extern void block_signals(void); 240 240 extern void unblock_signals(void); 241 - extern int set_signals(int enable); 242 - extern int set_signals_trace(int enable); 241 + extern int um_set_signals(int enable); 242 + extern int um_set_signals_trace(int enable); 243 243 extern int os_is_signal_stack(void); 244 244 extern void deliver_alarm(void); 245 245 extern void register_pm_wake_signal(void);
+1 -1
arch/um/kernel/ksyms.c
··· 6 6 #include <linux/module.h> 7 7 #include <os.h> 8 8 9 - EXPORT_SYMBOL(set_signals); 9 + EXPORT_SYMBOL(um_set_signals); 10 10 EXPORT_SYMBOL(signals_enabled); 11 11 12 12 EXPORT_SYMBOL(os_stat_fd);
+3 -3
arch/um/os-Linux/sigio.c
··· 132 132 int n; 133 133 char c; 134 134 135 - flags = set_signals_trace(0); 135 + flags = um_set_signals_trace(0); 136 136 CATCH_EINTR(n = write(sigio_private[0], &c, sizeof(c))); 137 137 if (n != sizeof(c)) { 138 138 printk(UM_KERN_ERR "update_thread : write failed, err = %d\n", ··· 147 147 goto fail; 148 148 } 149 149 150 - set_signals_trace(flags); 150 + um_set_signals_trace(flags); 151 151 return; 152 152 fail: 153 153 /* Critical section start */ ··· 161 161 close(write_sigio_fds[0]); 162 162 close(write_sigio_fds[1]); 163 163 /* Critical section end */ 164 - set_signals_trace(flags); 164 + um_set_signals_trace(flags); 165 165 } 166 166 167 167 int __add_sigio_fd(int fd)
+4 -4
arch/um/os-Linux/signal.c
··· 94 94 95 95 sig_handler_common(sig, si, mc); 96 96 97 - set_signals_trace(enabled); 97 + um_set_signals_trace(enabled); 98 98 } 99 99 100 100 static void timer_real_alarm_handler(mcontext_t *mc) ··· 126 126 127 127 signals_active &= ~SIGALRM_MASK; 128 128 129 - set_signals_trace(enabled); 129 + um_set_signals_trace(enabled); 130 130 } 131 131 132 132 void deliver_alarm(void) { ··· 348 348 } 349 349 } 350 350 351 - int set_signals(int enable) 351 + int um_set_signals(int enable) 352 352 { 353 353 int ret; 354 354 if (signals_enabled == enable) ··· 362 362 return ret; 363 363 } 364 364 365 - int set_signals_trace(int enable) 365 + int um_set_signals_trace(int enable) 366 366 { 367 367 int ret; 368 368 if (signals_enabled == enable)