Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / um / include / asm / processor-generic.h

diff --git a/arch/um/include/asm/processor-generic.h b/arch/um/include/asm/processor-generic.h
index c03cd5a02364493fe83c81261eb45c0689bcfed8..2d1e0dd5bb0bf55a7e543f9f7f9e0eefd6ab4cac 100644 (file)
--- a/arch/um/include/asm/processor-generic.h
+++ b/arch/um/include/asm/processor-generic.h
@@ -19,16 +19,14 @@ struct task_struct;
 struct mm_struct;
 
 struct thread_struct {
-       struct task_struct *saved_task;
        struct pt_regs regs;
+       struct pt_regs *segv_regs;
        int singlestep_syscall;
        void *fault_addr;
        jmp_buf *fault_catcher;
        struct task_struct *prev_sched;
-       unsigned long temp_stack;
        struct arch_thread arch;
        jmp_buf switch_buf;
-       int mm_count;
        struct {
                int op;
                union {
@@ -52,7 +50,6 @@ struct thread_struct {
        .regs                   = EMPTY_REGS,   \
        .fault_addr             = NULL, \
        .prev_sched             = NULL, \
-       .temp_stack             = 0, \
        .arch                   = INIT_ARCH_THREAD, \
        .request                = { 0 } \
 }
@@ -101,16 +98,8 @@ struct cpuinfo_um {
 
 extern struct cpuinfo_um boot_cpu_data;
 
-#define my_cpu_data            cpu_data[smp_processor_id()]
-
-#ifdef CONFIG_SMP
-extern struct cpuinfo_um cpu_data[];
-#define current_cpu_data cpu_data[smp_processor_id()]
-#else
 #define cpu_data (&boot_cpu_data)
 #define current_cpu_data boot_cpu_data
-#endif
-
 
 #define KSTK_REG(tsk, reg) get_thread_reg(reg, &tsk->thread.switch_buf)
 extern unsigned long get_wchan(struct task_struct *p);