From: Adam Thornton <adam@fsf.net>
Date: Sat, 31 Mar 2001 00:20:23 +0000 (+0000)
Subject: s390-updates-20010330
X-Git-Tag: openafs-stable-1_1_0~243
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=df9e479968824380b4a4c1d47c011785f71868e9;p=packages%2Fo%2Fopenafs.git

s390-updates-20010330


fix PRE_Block and lwp problems
---

diff --git a/src/lwp/lwp.c b/src/lwp/lwp.c
index 04a053ac1..d237fcb8a 100644
--- a/src/lwp/lwp.c
+++ b/src/lwp/lwp.c
@@ -39,7 +39,7 @@ extern char* getenv();
 extern void *malloc(int size);
 extern void *realloc(void *ptr, int size);
 #endif
-#if defined(AFS_OSF_ENV) || defined(AFS_LINUX20_ENV)
+#if defined(AFS_OSF_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_S390_LINUX20_ENV)
 extern int PRE_Block;	/* from preempt.c */
 #else
 extern char PRE_Block;	/* from preempt.c */
diff --git a/src/lwp/process.s b/src/lwp/process.s
index 7863db664..6412af693 100644
--- a/src/lwp/process.s
+++ b/src/lwp/process.s
@@ -202,7 +202,7 @@ savecontext:
               .long   PRE_Block
       .L0:
               l       %r5,0(%r5)              /* Get A(PRE_Block) */
-              mvi     0(%r5),1                /* Set it */
+              mvi     3(%r5),1                /* Set it */
               lr      %r6,%r3                 /* Get base of savearea */
               st      %r15,0(%r3)             /* Save stack pointer */
               ltr     %r4,%r4                 /* If new sp is 0 */
@@ -236,8 +236,9 @@ returnto:
                  .long          PRE_Block
       .L3:
               l       %r5,0(%r5)              /* Get A(PRE_Block) */
-              xc      0(4,%r5),0(%r5)         /* Clear it */
-              l       %r15,0(%r15)
+              /*xc      0(4,%r5),0(%r5)         /* Clear it */
+	      mvi     3(%r5),0                /* Clear it */ 
+	      l       %r15,0(%r15)
               lm      %r6,%r15,24(%r15)       /* Restore registers */
               br      %r14                    /* Return */