rename thread_info to stack

This finally renames the thread_info field in task structure to stack, so that
the assumptions about this field are gone and archs have more freedom about
placing the thread_info structure.

Nonbroken archs which have a proper thread pointer can do the access to both
current thread and task structure via a single pointer.

It'll allow for a few more cleanups of the fork code, from which e.g.  ia64
could benefit.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
[akpm@linux-foundation.org: build fix]
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Ian Molton <spyro@f2s.com>
Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Greg Ungerer <gerg@uclinux.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Kazumoto Kojima <kkojima@rr.iij4u.or.jp>
Cc: Richard Curnow <rc@rc0.org.uk>
Cc: William Lee Irwin III <wli@holomorphy.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Miles Bader <uclinux-v850@lsi.nec.co.jp>
Cc: Andi Kleen <ak@muc.de>
Cc: Chris Zankel <chris@zankel.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

11 files changed, 13 insertions, 13 deletions

diff --git a/arch/blackfin/kernel/ptrace.c b/arch/blackfin/kernel/ptrace.c
index d7c8e514cb92..e718bb4a1ef0 100644
--- a/arch/blackfin/kernel/ptrace.c
+++ b/arch/blackfin/kernel/ptrace.c
@@ -73,7 +73,7 @@
 static inline struct pt_regs *get_user_regs(struct task_struct *task)
 {
         return (struct pt_regs *)
-            ((unsigned long)task->thread_info +
+            ((unsigned long)task_stack_page(task) +
              (THREAD_SIZE - sizeof(struct pt_regs)));
 }
 
@@ -99,7 +99,7 @@ static inline long get_reg(struct task_struct *task, int regno)
         unsigned char *reg_ptr;
 
         struct pt_regs *regs =
-            (struct pt_regs *)((unsigned long)task->thread_info +
+            (struct pt_regs *)((unsigned long)task_stack_page(task) +
                                (THREAD_SIZE - sizeof(struct pt_regs)));
         reg_ptr = (char *)regs;
 
@@ -125,7 +125,7 @@ put_reg(struct task_struct *task, int regno, unsigned long data)
         char * reg_ptr;
 
         struct pt_regs *regs =
-            (struct pt_regs *)((unsigned long)task->thread_info +
+            (struct pt_regs *)((unsigned long)task_stack_page(task) +
                                (THREAD_SIZE - sizeof(struct pt_regs)));
         reg_ptr = (char *)regs;
 
diff --git a/arch/h8300/kernel/asm-offsets.c b/arch/h8300/kernel/asm-offsets.c
index b78b82ad28a3..fc30b4fd0914 100644
--- a/arch/h8300/kernel/asm-offsets.c
+++ b/arch/h8300/kernel/asm-offsets.c
@@ -30,7 +30,7 @@ int main(void)
         DEFINE(TASK_PTRACE, offsetof(struct task_struct, ptrace));
         DEFINE(TASK_BLOCKED, offsetof(struct task_struct, blocked));
         DEFINE(TASK_THREAD, offsetof(struct task_struct, thread));
-        DEFINE(TASK_THREAD_INFO, offsetof(struct task_struct, thread_info));
+        DEFINE(TASK_THREAD_INFO, offsetof(struct task_struct, stack));
         DEFINE(TASK_MM, offsetof(struct task_struct, mm));
         DEFINE(TASK_ACTIVE_MM, offsetof(struct task_struct, active_mm));
 
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 1d7cc7e2ce32..f8ae709de0b5 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -1689,7 +1689,7 @@ format_mca_init_stack(void *mca_data, unsigned long offset,
         ti->preempt_count = 1;
         ti->task = p;
         ti->cpu = cpu;
-        p->thread_info = ti;
+        p->stack = ti;
         p->state = TASK_UNINTERRUPTIBLE;
         cpu_set(cpu, p->cpus_allowed);
         INIT_LIST_HEAD(&p->tasks);
diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c
index 761a779d5c4f..3b27309d54b1 100644
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
@@ -82,7 +82,7 @@ void output_task_defines(void)
 {
         text("/* MIPS task_struct offsets. */");
         offset("#define TASK_STATE         ", struct task_struct, state);
-        offset("#define TASK_THREAD_INFO   ", struct task_struct, thread_info);
+        offset("#define TASK_THREAD_INFO   ", struct task_struct, stack);
         offset("#define TASK_FLAGS         ", struct task_struct, flags);
         offset("#define TASK_MM            ", struct task_struct, mm);
         offset("#define TASK_PID           ", struct task_struct, pid);
diff --git a/arch/parisc/kernel/asm-offsets.c b/arch/parisc/kernel/asm-offsets.c
index 54fdb959149c..d3b7917a87cb 100644
--- a/arch/parisc/kernel/asm-offsets.c
+++ b/arch/parisc/kernel/asm-offsets.c
@@ -54,7 +54,7 @@
 
 int main(void)
 {
-        DEFINE(TASK_THREAD_INFO, offsetof(struct task_struct, thread_info));
+        DEFINE(TASK_THREAD_INFO, offsetof(struct task_struct, stack));
         DEFINE(TASK_STATE, offsetof(struct task_struct, state));
         DEFINE(TASK_FLAGS, offsetof(struct task_struct, flags));
         DEFINE(TASK_SIGPENDING, offsetof(struct task_struct, pending));
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index 8f48560b7ee2..37bc35e69dbe 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -58,7 +58,7 @@ int main(void)
 #ifdef CONFIG_PPC64
         DEFINE(AUDITCONTEXT, offsetof(struct task_struct, audit_context));
 #else
-        DEFINE(THREAD_INFO, offsetof(struct task_struct, thread_info));
+        DEFINE(THREAD_INFO, offsetof(struct task_struct, stack));
         DEFINE(PTRACE, offsetof(struct task_struct, ptrace));
 #endif /* CONFIG_PPC64 */
 
diff --git a/arch/ppc/kernel/asm-offsets.c b/arch/ppc/kernel/asm-offsets.c
index c5850a272650..e8e94321b59e 100644
--- a/arch/ppc/kernel/asm-offsets.c
+++ b/arch/ppc/kernel/asm-offsets.c
@@ -35,7 +35,7 @@ int
 main(void)
 {
         DEFINE(THREAD, offsetof(struct task_struct, thread));
-        DEFINE(THREAD_INFO, offsetof(struct task_struct, thread_info));
+        DEFINE(THREAD_INFO, offsetof(struct task_struct, stack));
         DEFINE(MM, offsetof(struct task_struct, mm));
         DEFINE(PTRACE, offsetof(struct task_struct, ptrace));
         DEFINE(KSP, offsetof(struct thread_struct, ksp));
diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c
index ec514fe5ccd0..1375f8a4469e 100644
--- a/arch/s390/kernel/asm-offsets.c
+++ b/arch/s390/kernel/asm-offsets.c
@@ -15,7 +15,7 @@
 
 int main(void)
 {
-        DEFINE(__THREAD_info, offsetof(struct task_struct, thread_info),);
+        DEFINE(__THREAD_info, offsetof(struct task_struct, stack),);
         DEFINE(__THREAD_ksp, offsetof(struct task_struct, thread.ksp),);
         DEFINE(__THREAD_per, offsetof(struct task_struct, thread.per_info),);
         DEFINE(__THREAD_mm_segment,
diff --git a/arch/sparc/kernel/asm-offsets.c b/arch/sparc/kernel/asm-offsets.c
index 29d7cfd1c970..6773ed76e414 100644
--- a/arch/sparc/kernel/asm-offsets.c
+++ b/arch/sparc/kernel/asm-offsets.c
@@ -28,7 +28,7 @@ int foo(void)
         DEFINE(AOFF_task_gid, offsetof(struct task_struct, gid));
         DEFINE(AOFF_task_euid, offsetof(struct task_struct, euid));
         DEFINE(AOFF_task_egid, offsetof(struct task_struct, egid));
-        /* DEFINE(THREAD_INFO, offsetof(struct task_struct, thread_info)); */
+        /* DEFINE(THREAD_INFO, offsetof(struct task_struct, stack)); */
         DEFINE(ASIZ_task_uid,   sizeof(current->uid));
         DEFINE(ASIZ_task_gid,   sizeof(current->gid));
         DEFINE(ASIZ_task_euid,  sizeof(current->euid));
diff --git a/arch/v850/kernel/asm-offsets.c b/arch/v850/kernel/asm-offsets.c
index 24f291369070..cee5c3142d41 100644
--- a/arch/v850/kernel/asm-offsets.c
+++ b/arch/v850/kernel/asm-offsets.c
@@ -29,7 +29,7 @@ int main (void)
         DEFINE (TASK_PTRACE, offsetof (struct task_struct, ptrace));
         DEFINE (TASK_BLOCKED, offsetof (struct task_struct, blocked));
         DEFINE (TASK_THREAD, offsetof (struct task_struct, thread));
-        DEFINE (TASK_THREAD_INFO, offsetof (struct task_struct, thread_info));
+        DEFINE (TASK_THREAD_INFO, offsetof (struct task_struct, stack));
         DEFINE (TASK_MM, offsetof (struct task_struct, mm));
         DEFINE (TASK_ACTIVE_MM, offsetof (struct task_struct, active_mm));
         DEFINE (TASK_PID, offsetof (struct task_struct, pid));
diff --git a/arch/xtensa/kernel/asm-offsets.c b/arch/xtensa/kernel/asm-offsets.c
index b256cfbef344..698079b3a336 100644
--- a/arch/xtensa/kernel/asm-offsets.c
+++ b/arch/xtensa/kernel/asm-offsets.c
@@ -70,7 +70,7 @@ int main(void)
         DEFINE(TASK_ACTIVE_MM, offsetof (struct task_struct, active_mm));
         DEFINE(TASK_PID, offsetof (struct task_struct, pid));
         DEFINE(TASK_THREAD, offsetof (struct task_struct, thread));
-        DEFINE(TASK_THREAD_INFO, offsetof (struct task_struct, thread_info));
+        DEFINE(TASK_THREAD_INFO, offsetof (struct task_struct, stack));
         DEFINE(TASK_STRUCT_SIZE, sizeof (struct task_struct));
         BLANK();