Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus

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

diff --git a/include/asm-um/processor-generic.h b/include/asm-um/processor-generic.h
index 4d9404989b5a7ae94457f294960a98f59ccab3df..b2fc94fbc2d90292ecfa53b64a8f97161d4deabf 100644 (file)
--- a/include/asm-um/processor-generic.h
+++ b/include/asm-um/processor-generic.h
@@ -17,12 +17,13 @@ struct task_struct;
 struct mm_struct;
 
 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). */
        int forking;
        int nsyscalls;
        struct pt_regs regs;
-       unsigned long cr2;
-       int err;
-       unsigned long trap_no;
        int singlestep_syscall;
        void *fault_addr;
        void *fault_catcher;
@@ -70,8 +71,6 @@ struct thread_struct {
        .forking                = 0, \
        .nsyscalls              = 0, \
         .regs                  = EMPTY_REGS, \
-       .cr2                    = 0, \
-       .err                    = 0, \
        .fault_addr             = NULL, \
        .prev_sched             = NULL, \
        .temp_stack             = 0, \