Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ff1d36c authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] um: remove dead code about os_usr1_signal() and os_usr1_process() 



os_usr1_signal() is totally unused, os_usr1_process() is used only by TT mode.

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 83f4e8af

arch/um/include/os.h

+2 −1
Original line number Diff line number Diff line
@@ -192,7 +192,9 @@ extern int os_process_parent(int pid); 
extern void os_stop_process(int pid);

extern void os_kill_process(int pid, int reap_child);

extern void os_kill_ptraced_process(int pid, int reap_child);

#ifdef UML_CONFIG_MODE_TT

extern void os_usr1_process(int pid);

#endif

extern long os_ptrace_ldt(long pid, long addr, long data);



extern int os_getpid(void);
@@ -261,7 +263,6 @@ extern void block_signals(void); 
extern void unblock_signals(void);

extern int get_signals(void);

extern int set_signals(int enable);

extern void os_usr1_signal(int on);



/* trap.c */

extern void os_fill_handlinfo(struct kern_handlers h);

arch/um/os-Linux/process.c

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "longjmp.h"

#include "skas_ptrace.h"

#include "kern_constants.h"

#include "uml-config.h"



#define ARBITRARY_ADDR -1

#define FAILURE_PID    -1
@@ -131,10 +132,12 @@ void os_kill_ptraced_process(int pid, int reap_child) 
		CATCH_EINTR(waitpid(pid, NULL, 0));

}



#ifdef UML_CONFIG_MODE_TT

void os_usr1_process(int pid)

{

	kill(pid, SIGUSR1);

}

#endif



/* Don't use the glibc version, which caches the result in TLS. It misses some

 * syscalls, and also breaks with clone(), which does not unshare the TLS.

arch/um/os-Linux/signal.c

+0 −5
Original line number Diff line number Diff line
@@ -243,8 +243,3 @@ int set_signals(int enable) 


	return ret;

}
 


void os_usr1_signal(int on)

{

	change_sig(SIGUSR1, on);

}