um: Remove unused fields from thread_struct

These fields are no longer used since the removal of tt mode.

Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com>
Signed-off-by: Richard Weinberger <richard@nod.at>

diff --git a/arch/um/include/asm/processor-generic.h b/arch/um/include/asm/processor-generic.h
index 5a7c05275aa74d30595506f5b97399d63911b96c..bce4595798dae5d244b1fba966d46a2129f742da 100644 (file)
--- a/arch/um/include/asm/processor-generic.h
+++ b/arch/um/include/asm/processor-generic.h
@@ -28,20 +28,10 @@ struct thread_struct {
        struct arch_thread arch;
        jmp_buf switch_buf;
        struct {
-               int op;
-               union {
-                       struct {
-                               int pid;
-                       } fork, exec;
-                       struct {
-                               int (*proc)(void *);
-                               void *arg;
-                       } thread;
-                       struct {
-                               void (*proc)(void *);
-                               void *arg;
-                       } cb;
-               } u;
+               struct {
+                       int (*proc)(void *);
+                       void *arg;
+               } thread;
        } request;
 };
 
@@ -51,7 +41,7 @@ struct thread_struct {
        .fault_addr             = NULL, \
        .prev_sched             = NULL, \
        .arch                   = INIT_ARCH_THREAD, \
-       .request                = { 0 } \
+       .request                = { } \
 }
 
 /*

diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index f36b63f53babd4719edd57125799acca6566071e..be2856af6d4c31fdc5b974bf6d1659c9f4e22c74 100644 (file)
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -109,8 +109,8 @@ void new_thread_handler(void)
                schedule_tail(current->thread.prev_sched);
        current->thread.prev_sched = NULL;
 
-       fn = current->thread.request.u.thread.proc;
-       arg = current->thread.request.u.thread.arg;
+       fn = current->thread.request.thread.proc;
+       arg = current->thread.request.thread.arg;
 
        /*
         * callback returns only if the kernel thread execs a process
@@ -158,8 +158,8 @@ int copy_thread(struct task_struct * p, const struct kernel_clone_args *args)
                arch_copy_thread(&current->thread.arch, &p->thread.arch);
        } else {
                get_safe_registers(p->thread.regs.regs.gp, p->thread.regs.regs.fp);
-               p->thread.request.u.thread.proc = args->fn;
-               p->thread.request.u.thread.arg = args->fn_arg;
+               p->thread.request.thread.proc = args->fn;
+               p->thread.request.thread.arg = args->fn_arg;
                handler = new_thread_handler;
        }
 

diff --git a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c
index 5f9c1c5f36e2fd69b80a15855216875e8baf7153..68657988c8d1aea61280a5ed46543c5777a3e1e9 100644 (file)
--- a/arch/um/kernel/skas/process.c
+++ b/arch/um/kernel/skas/process.c
@@ -39,8 +39,8 @@ int __init start_uml(void)
 
        init_new_thread_signals();
 
-       init_task.thread.request.u.thread.proc = start_kernel_proc;
-       init_task.thread.request.u.thread.arg = NULL;
+       init_task.thread.request.thread.proc = start_kernel_proc;
+       init_task.thread.request.thread.arg = NULL;
        return start_idle_thread(task_stack_page(&init_task),
                                 &init_task.thread.switch_buf);
 }