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

Commit e64bd134 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] uml: signal initialization cleanup 



It turns out that init_new_thread_signals is always called with altstack == 1,
so we can eliminate the parameter.

Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9914aee8

arch/um/include/os.h

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ extern int os_getpid(void); 
extern int os_getpgrp(void);



extern void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int));

extern void init_new_thread_signals(int altstack);

extern void init_new_thread_signals(void);

extern int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr);



extern int os_map_memory(void *virt, int fd, unsigned long long off,

arch/um/kernel/skas/process_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ int start_uml_skas(void) 
	if(proc_mm)

		userspace_pid[0] = start_userspace(0);



	init_new_thread_signals(1);

	init_new_thread_signals();



	init_task.thread.request.u.thread.proc = start_kernel_proc;

	init_task.thread.request.u.thread.arg = NULL;

arch/um/kernel/tt/exec_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
static int exec_tramp(void *sig_stack)

{

	init_new_thread_stack(sig_stack, NULL);

	init_new_thread_signals(1);

	init_new_thread_signals();

	os_stop_process(os_getpid());

	return(0);

}

arch/um/kernel/tt/process_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static void new_thread_handler(int sig) 
		schedule_tail(current->thread.prev_sched);

	current->thread.prev_sched = NULL;



	init_new_thread_signals(1);

	init_new_thread_signals();

	enable_timer();

	free_page(current->thread.temp_stack);

	set_cmdline("(kernel thread)");

arch/um/os-Linux/process.c

+9 −10
Original line number Diff line number Diff line
@@ -250,25 +250,24 @@ void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int)) 
	if(usr1_handler) set_handler(SIGUSR1, usr1_handler, flags, -1);

}



void init_new_thread_signals(int altstack)

void init_new_thread_signals(void)

{

	int flags = altstack ? SA_ONSTACK : 0;



	set_handler(SIGSEGV, (__sighandler_t) sig_handler, flags,

	set_handler(SIGSEGV, (__sighandler_t) sig_handler, SA_ONSTACK,

		    SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);

	set_handler(SIGTRAP, (__sighandler_t) sig_handler, flags,

	set_handler(SIGTRAP, (__sighandler_t) sig_handler, SA_ONSTACK,

		    SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);

	set_handler(SIGFPE, (__sighandler_t) sig_handler, flags,

	set_handler(SIGFPE, (__sighandler_t) sig_handler, SA_ONSTACK,

		    SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);

	set_handler(SIGILL, (__sighandler_t) sig_handler, flags,

	set_handler(SIGILL, (__sighandler_t) sig_handler, SA_ONSTACK,

		    SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);

	set_handler(SIGBUS, (__sighandler_t) sig_handler, flags,

	set_handler(SIGBUS, (__sighandler_t) sig_handler, SA_ONSTACK,

		    SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);

	set_handler(SIGUSR2, (__sighandler_t) sig_handler,

		    flags, SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);

		    SA_ONSTACK, SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM,

		    -1);

	signal(SIGHUP, SIG_IGN);



	init_irq_signals(altstack);

	init_irq_signals(1);

}



int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr)