UML - eliminate useless thread field
PATCH 1/1 UML - eliminate useless thread field
This patch eliminates use of task.thread.kernel_stack. It was unnecessary, confusing, and was masking some kernel stack size assumptions.
Jeff
arch/um/kernel/process.c +1 -1
@@ -46,7 +46,7 @@int flags =0 , pages;if (sig_stack !=NULL ){ - pages = (1 <<UML_CONFIG_KERNEL_STACK_ORDER ) -2 ; + pages = (1 <<UML_CONFIG_KERNEL_STACK_ORDER );set_sigstack (sig_stack, pages *page_size ()); flags =SA_ONSTACK ; }
arch/um/kernel/process_kern.c +1 -4
@@ -166,8 +166,6 @@ struct pt_regs *regs) { p->thread = (struct thread_struct )INIT_THREAD ; - p->thread.kernel_stack = - (unsigned long ) p->thread_info +2 *PAGE_SIZE ;return (CHOOSE_MODE_PROC (copy_thread_tt, copy_thread_skas, nr, clone_flags, sp, stack_top, p, regs)); }
@@ -327,8 +325,7 @@unsigned long stack; stack = sp & (PAGE_MASK <<CONFIG_KERNEL_STACK_ORDER ); - stack +=2 *PAGE_SIZE ; -return (stack != current->thread.kernel_stack); +return (stack != (unsigned long ) current_thread); }extern void remove_umid_dir (void );
arch/um/kernel/skas/process_kern.c +2 -3
@@ -191,8 +191,7 @@ handler = new_thread_handler; } -new_thread ((void *) p->thread.kernel_stack, - &p->thread.mode.skas.switch_buf, +new_thread (p->thread_info, &p->thread.mode.skas.switch_buf, &p->thread.mode.skas.fork_buf, handler);return (0 ); }
@@ -231,7 +230,7 @@ init_task.thread.request.u.thread.proc = start_kernel_proc; init_task.thread.request.u.thread.arg =NULL ; -return (start_idle_thread ((void *) init_task.thread.kernel_stack, +return (start_idle_thread (init_task.thread_info, &init_task.thread.mode.skas.switch_buf, &init_task.thread.mode.skas.fork_buf)); }
arch/um/kernel/tt/exec_kern.c +1 -2
@@ -39,8 +39,7 @@do_exit (SIGKILL ); } - new_pid =start_fork_tramp ((void *) current->thread.kernel_stack, - stack,0 , exec_tramp); + new_pid =start_fork_tramp (current->thread_info, stack,0 , exec_tramp);if (new_pid <0 ){ printk(KERN_ERR "flush_thread : new thread failed, errno = %d\n",
arch/um/kernel/tt/process_kern.c +4 -5
@@ -248,8 +248,7 @@ clone_flags &=CLONE_VM ; p->thread.temp_stack = stack; - new_pid =start_fork_tramp ((void *) p->thread.kernel_stack, stack, - clone_flags, tramp); + new_pid =start_fork_tramp (p->thread_info, stack, clone_flags, tramp);if (new_pid <0 ){printk (KERN_ERR "copy_thread : clone failed - errno = %d\n" , -new_pid);
@@ -501,9 +500,9 @@void *sp;int pages; - pages = (1 <<CONFIG_KERNEL_STACK_ORDER ) -2 ; - sp = (void *) init_task.thread.kernel_stack + pages *PAGE_SIZE - -sizeof (unsigned long ); + pages = (1 <<CONFIG_KERNEL_STACK_ORDER ); + sp = (void *) ((unsigned long ) init_task.thread_info) + + pages *PAGE_SIZE -sizeof (unsigned long );return (tracer (start_kernel_proc, sp)); }
arch/um/kernel/um_arch.c +0 -3
@@ -380,9 +380,6 @@uml_postsetup (); - init_task.thread.kernel_stack = (unsigned long ) &init_thread_info + -2 *PAGE_SIZE ; -task_protections ((unsigned long ) &init_thread_info);os_flush_stdout ();
include/asm-um/processor-generic.h +0 -2
@@ -22,7 +22,6 @@struct thread_struct {int forking; -unsigned long kernel_stack;int nsyscalls;struct pt_regs regs;unsigned long cr2;
@@ -73,7 +72,6 @@#define INIT_THREAD \ { \ .forking = 0, \ - .kernel_stack = 0, \ .nsyscalls = 0, \ .regs = EMPTY_REGS, \ .cr2 = 0, \