Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-30 14:52:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] alpha: Fix getxpid on alpha so it works for threads

Browse Source 
While looking in the code I discovered that alpha has fallen behind because
it doesn't use sys_getppid.  The problem is that it doesn't follow the task
struct to the task_group_leader.

Acked-by: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Eric W. Biederman 2006-02-01 03:06:12 -08:00 committed by Linus Torvalds
parent 975b3d3d5b
commit 9a5e733990
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/alpha/kernel/asm-offsets.c
View File

@ -28,6 +28,7 @@ void foo(void)
DEFINE(TASK_GID, offsetof(struct task_struct, gid)); DEFINE(TASK_GID, offsetof(struct task_struct, gid));
DEFINE(TASK_EGID, offsetof(struct task_struct, egid)); DEFINE(TASK_EGID, offsetof(struct task_struct, egid));
DEFINE(TASK_REAL_PARENT, offsetof(struct task_struct, real_parent)); DEFINE(TASK_REAL_PARENT, offsetof(struct task_struct, real_parent));
DEFINE(TASK_GROUP_LEADER, offsetof(struct task_struct, group_leader));
DEFINE(TASK_TGID, offsetof(struct task_struct, tgid)); DEFINE(TASK_TGID, offsetof(struct task_struct, tgid));
BLANK(); BLANK();

16
arch/alpha/kernel/entry.S
View File

@ -879,17 +879,19 @@ sys_getxpid:
/* See linux/kernel/timer.c sys_getppid for discussion /* See linux/kernel/timer.c sys_getppid for discussion
about this loop. */ about this loop. */
ldq $3, TASK_REAL_PARENT($2) ldq $3, TASK_GROUP_LEADER($2)
1: ldl $1, TASK_TGID($3) ldq $4, TASK_REAL_PARENT($3)
ldl $0, TASK_TGID($2)
1: ldl $1, TASK_TGID($4)
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
mov $3, $4 mov $4, $5
mb mb
ldq $3, TASK_REAL_PARENT($2) ldq $3, TASK_GROUP_LEADER($2)
cmpeq $3, $4, $4 ldq $4, TASK_REAL_PARENT($3)
beq $4, 1b cmpeq $4, $5, $5
beq $5, 1b
#endif #endif
stq $1, 80($sp) stq $1, 80($sp)
ldl $0, TASK_TGID($2)
ret ret
.end sys_getxpid .end sys_getxpid