Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7e4217b authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds
Browse files

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: default avatarRoman 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c9f4f06d

arch/blackfin/kernel/ptrace.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

arch/h8300/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -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));

arch/ia64/kernel/mca.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/mips/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/parisc/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -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));