s390 fixes (11/12).
PATCH 1/1 s390 fixes (11/12).
fix support for thread local storage on s390
diff -urN linux-2.5.59/arch/s390/kernel/process.clinux-2.5.59-s390/arch/s390/kernel/process.c
arch/s390/kernel/process.c +5 -3
@@ -196,8 +196,6 @@/* new return point is ret_from_fork */ frame->gprs[8 ] = (unsigned long ) ret_from_fork; -/* start disabled because of schedule_tick and rq->lock being held */ - frame->childregs.psw.mask &= ~0x03000000 ;/* fake return stack for resume(), don't go back to schedule */ frame->gprs[9 ] = (unsigned long ) frame;
@@ -213,6 +211,10 @@ p->thread.ar4 =get_fs ().ar4;/* Don't copy debug registers */ memset (&p->thread.per_info,0 ,sizeof (p->thread.per_info)); + +/* Set a new TLS ? */ +if (clone_flags &CLONE_SETTLS ) + frame->childregs.acrs[0 ] = regs->gprs[6 ];return 0 ; }
@@ -335,7 +337,7 @@int count =0 ;if (!p || p == current || p->state ==TASK_RUNNING )return 0 ; - stack_page = (unsigned long ) p; + stack_page = (unsigned long ) p->thread_info; r15 = p->thread.ksp;if (!stack_page || r15 < stack_page || r15 >=8188 +stack_page)return 0 ;
diff -urN linux-2.5.59/arch/s390x/kernel/process.c linux-2.5.59-s390/arch/s390x/kernel/process.c
arch/s390x/kernel/process.c +14 -1
@@ -203,6 +203,19 @@ p->thread.ar4 =get_fs ().ar4;/* Don't copy debug registers */ memset (&p->thread.per_info,0 ,sizeof (p->thread.per_info)); + +/* Set a new TLS ? */ +if (clone_flags &CLONE_SETTLS ) { +if (current->thread.flags &S390_FLAG_31BIT ) { + frame->childregs.acrs[0 ] = + (unsigned int ) regs->gprs[6 ]; + }else { + frame->childregs.acrs[0 ] = + (unsigned int )(regs->gprs[6 ] >>32 ); + frame->childregs.acrs[1 ] = + (unsigned int ) regs->gprs[6 ]; + } + }return 0 ; }
@@ -319,7 +332,7 @@int count =0 ;if (!p || p == current || p->state ==TASK_RUNNING )return 0 ; - stack_page = (unsigned long ) p; + stack_page = (unsigned long ) p->thread_info; r15 = p->thread.ksp;if (!stack_page || r15 < stack_page || r15 >=16380 +stack_page)return 0 ;