Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / include / asm-um / processor-generic.h

diff --git a/include/asm-um/processor-generic.h b/include/asm-um/processor-generic.h
index b2a2bd4..d99bbdd 100644 (file)
--- a/include/asm-um/processor-generic.h
+++ b/include/asm-um/processor-generic.h
@@ -10,26 +10,23 @@ struct pt_regs;
 
 struct task_struct;
 
-#include "linux/config.h"
 #include "asm/ptrace.h"
 #include "choose-mode.h"
+#include "registers.h"
+#include "sysdep/archsetjmp.h"
 
 struct mm_struct;
 
-#define current_text_addr() ((void *) 0)
-
-#define cpu_relax()   barrier()
-
-#define STACK_PAGE_COUNT       (4096/PAGE_SIZE)
-
 struct thread_struct {
+       /* This flag is set to 1 before calling do_fork (and analyzed in
+        * copy_thread) to mark that we are begin called from userspace (fork /
+        * vfork / clone), and reset to 0 after. It is left to 0 when called
+        * from kernelspace (i.e. kernel_thread() or fork_idle(), as of 2.6.11). */
+       struct task_struct *saved_task;
        int forking;
-       unsigned long kernel_stack;
        int nsyscalls;
        struct pt_regs regs;
-       unsigned long cr2;
-       int err;
-       unsigned long trap_no;
+       int singlestep_syscall;
        void *fault_addr;
        void *fault_catcher;
        struct task_struct *prev_sched;
@@ -42,14 +39,12 @@ struct thread_struct {
                        int extern_pid;
                        int tracing;
                        int switch_pipe[2];
-                       int singlestep_syscall;
                        int vm_seq;
                } tt;
 #endif
 #ifdef CONFIG_MODE_SKAS
                struct {
-                       void *switch_buf;
-                       void *fork_buf;
+                       jmp_buf switch_buf;
                        int mm_count;
                } skas;
 #endif
@@ -75,11 +70,8 @@ struct thread_struct {
 #define INIT_THREAD \
 { \
        .forking                = 0, \
-       .kernel_stack           = 0, \
        .nsyscalls              = 0, \
         .regs                  = EMPTY_REGS, \
-       .cr2                    = 0, \
-       .err                    = 0, \
        .fault_addr             = NULL, \
        .prev_sched             = NULL, \
        .temp_stack             = 0, \
@@ -96,12 +88,15 @@ extern struct task_struct *alloc_task_struct(void);
 
 extern void release_thread(struct task_struct *);
 extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
-extern void dump_thread(struct pt_regs *regs, struct user *u);
-extern void prepare_to_copy(struct task_struct *tsk);
+
+static inline void prepare_to_copy(struct task_struct *tsk)
+{
+}
+
 
 extern unsigned long thread_saved_pc(struct task_struct *t);
 
-static inline void mm_copy_segments(struct mm_struct *from_mm, 
+static inline void mm_copy_segments(struct mm_struct *from_mm,
                                    struct mm_struct *new_mm)
 {
 }
@@ -113,7 +108,6 @@ static inline void mm_copy_segments(struct mm_struct *from_mm,
  */
 extern unsigned long task_size;
 
-#undef TASK_SIZE
 #define TASK_SIZE      (task_size)
 
 /* This decides where the kernel will search for a free chunk of vm
@@ -141,19 +135,13 @@ extern struct cpuinfo_um cpu_data[];
 #define current_cpu_data boot_cpu_data
 #endif
 
-#define KSTK_EIP(tsk) (PT_REGS_IP(&tsk->thread.regs))
-#define KSTK_ESP(tsk) (PT_REGS_SP(&tsk->thread.regs))
-#define get_wchan(p) (0)
 
+#ifdef CONFIG_MODE_SKAS
+#define KSTK_REG(tsk, reg) \
+       get_thread_reg(reg, &tsk->thread.mode.skas.switch_buf)
+#else
+#define KSTK_REG(tsk, reg) (0xbadbabe)
 #endif
+#define get_wchan(p) (0)
 
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
+#endif