Commit bbe33504 authored by Johannes Berg's avatar Johannes Berg Committed by Richard Weinberger
Browse files

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: default avatarkernel test robot <lkp@intel.com>
Fixes: 68f5d3f3 ("um: add PCI over virtio emulation driver")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 5f8539e2

arch/um/include/asm/irqflags.h

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#define __UM_IRQFLAGS_H



extern int signals_enabled;

int set_signals(int enable);

int um_set_signals(int enable);

void block_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

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

arch/um/include/shared/longjmp.h

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/um/include/shared/os.h

+2 −2
Original line number Diff line number Diff line
@@ -238,8 +238,8 @@ extern void send_sigio_to_self(void); 
extern int change_sig(int signal, int on);

extern void block_signals(void);

extern void unblock_signals(void);

extern int set_signals(int enable);

extern int set_signals_trace(int enable);

extern int um_set_signals(int enable);

extern int um_set_signals_trace(int enable);

extern int os_is_signal_stack(void);

extern void deliver_alarm(void);

extern void register_pm_wake_signal(void);

arch/um/kernel/ksyms.c

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#include <linux/module.h>

#include <os.h>



EXPORT_SYMBOL(set_signals);

EXPORT_SYMBOL(um_set_signals);

EXPORT_SYMBOL(signals_enabled);



EXPORT_SYMBOL(os_stat_fd);

arch/um/os-Linux/sigio.c

+3 −3
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static void update_thread(void) 
	int n;

	char c;



	flags = set_signals_trace(0);

	flags = um_set_signals_trace(0);

	CATCH_EINTR(n = write(sigio_private[0], &c, sizeof(c)));

	if (n != sizeof(c)) {

		printk(UM_KERN_ERR "update_thread : write failed, err = %d\n",
@@ -147,7 +147,7 @@ static void update_thread(void) 
		goto fail;

	}



	set_signals_trace(flags);

	um_set_signals_trace(flags);

	return;

 fail:

	/* Critical section start */
@@ -161,7 +161,7 @@ static void update_thread(void) 
	close(write_sigio_fds[0]);

	close(write_sigio_fds[1]);

	/* Critical section end */

	set_signals_trace(flags);

	um_set_signals_trace(flags);

}



int __add_sigio_fd(int fd)