2 files changed, 37 insertions, 4 deletions

diff --git a/arch/ia64/kernel/asm-offsets.c b/arch/ia64/kernel/asm-offsets.c
index 0aebc6f79e95..f7bc40dee43d 100644
--- a/arch/ia64/kernel/asm-offsets.c
+++ b/arch/ia64/kernel/asm-offsets.c
@@ -7,6 +7,7 @@
 #define ASM_OFFSETS_C 1
 
 #include <linux/sched.h>
+#include <linux/pid.h>
 #include <linux/clocksource.h>
 
 #include <asm-ia64/processor.h>
@@ -34,6 +35,9 @@ void foo(void)
         DEFINE(SIGFRAME_SIZE, sizeof (struct sigframe));
         DEFINE(UNW_FRAME_INFO_SIZE, sizeof (struct unw_frame_info));
 
+        BUILD_BUG_ON(sizeof(struct upid) != 32);
+        DEFINE(IA64_UPID_SHIFT, 5);
+
         BLANK();
 
         DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
@@ -45,6 +49,9 @@ void foo(void)
         DEFINE(IA64_TASK_BLOCKED_OFFSET,offsetof (struct task_struct, blocked));
         DEFINE(IA64_TASK_CLEAR_CHILD_TID_OFFSET,offsetof (struct task_struct, clear_child_tid));
         DEFINE(IA64_TASK_GROUP_LEADER_OFFSET, offsetof (struct task_struct, group_leader));
+        DEFINE(IA64_TASK_TGIDLINK_OFFSET, offsetof (struct task_struct, pids[PIDTYPE_PID].pid));
+        DEFINE(IA64_PID_LEVEL_OFFSET, offsetof (struct pid, level));
+        DEFINE(IA64_PID_UPID_OFFSET, offsetof (struct pid, numbers[0]));
         DEFINE(IA64_TASK_PENDING_OFFSET,offsetof (struct task_struct, pending));
         DEFINE(IA64_TASK_PID_OFFSET, offsetof (struct task_struct, pid));
         DEFINE(IA64_TASK_REAL_PARENT_OFFSET, offsetof (struct task_struct, real_parent));
diff --git a/arch/ia64/kernel/fsys.S b/arch/ia64/kernel/fsys.S
index 44841971f077..3f570e6fcd9c 100644
--- a/arch/ia64/kernel/fsys.S
+++ b/arch/ia64/kernel/fsys.S
@@ -61,13 +61,29 @@ ENTRY(fsys_getpid)
         .prologue
         .altrp b6
         .body
+        add r17=IA64_TASK_GROUP_LEADER_OFFSET,r16
+        ;;
+        ld8 r17=[r17]                           // r17 = current->group_leader
         add r9=TI_FLAGS+IA64_TASK_SIZE,r16
         ;;
         ld4 r9=[r9]
-        add r8=IA64_TASK_TGID_OFFSET,r16
+        add r17=IA64_TASK_TGIDLINK_OFFSET,r17
         ;;
         and r9=TIF_ALLWORK_MASK,r9
-        ld4 r8=[r8]                             // r8 = current->tgid
+        ld8 r17=[r17]                           // r17 = current->group_leader->pids[PIDTYPE_PID].pid
+        ;;
+        add r8=IA64_PID_LEVEL_OFFSET,r17
+        ;;
+        ld4 r8=[r8]                             // r8 = pid->level
+        add r17=IA64_PID_UPID_OFFSET,r17        // r17 = &pid->numbers[0]
+        ;;
+        shl r8=r8,IA64_UPID_SHIFT
+        ;;
+        add r17=r17,r8                          // r17 = &pid->numbers[pid->level]
+        ;;
+        ld4 r8=[r17]                            // r8 = pid->numbers[pid->level].nr
+        ;;
+        mov r17=0
         ;;
         cmp.ne p8,p0=0,r9
 (p8)    br.spnt.many fsys_fallback_syscall
@@ -126,15 +142,25 @@ ENTRY(fsys_set_tid_address)
         .altrp b6
         .body
         add r9=TI_FLAGS+IA64_TASK_SIZE,r16
+        add r17=IA64_TASK_TGIDLINK_OFFSET,r16
         ;;
         ld4 r9=[r9]
         tnat.z p6,p7=r32                // check argument register for being NaT
+        ld8 r17=[r17]                           // r17 = current->pids[PIDTYPE_PID].pid
         ;;
         and r9=TIF_ALLWORK_MASK,r9
-        add r8=IA64_TASK_PID_OFFSET,r16
+        add r8=IA64_PID_LEVEL_OFFSET,r17
         add r18=IA64_TASK_CLEAR_CHILD_TID_OFFSET,r16
         ;;
-        ld4 r8=[r8]
+        ld4 r8=[r8]                             // r8 = pid->level
+        add r17=IA64_PID_UPID_OFFSET,r17        // r17 = &pid->numbers[0]
+        ;;
+        shl r8=r8,IA64_UPID_SHIFT
+        ;;
+        add r17=r17,r8                          // r17 = &pid->numbers[pid->level]
+        ;;
+        ld4 r8=[r17]                            // r8 = pid->numbers[pid->level].nr
+        ;;
         cmp.ne p8,p0=0,r9
         mov r17=-1
         ;;