Skip to contentSkip to conversation

s390 (1/7): s390 arch fixes.

PATCH Pete Zaitcev 1 participant 2 messages Mar 7, 2003 1 message not in the archive

lore
Share & tools
lore
#1 lore raw
In reply to a message not in the archive

include/asm-s390/system.h line 88

Quoted 11 lines
include/asm-s390/system.h +1 -1
@@ -82,7 +82,7 @@
 		break;							     \
 	save_fp_regs(&prev->thread.fp_regs);				     \
 	restore_fp_regs(&next->thread.fp_regs);				     \
-	resume(prev,next);						     \
+	prev = resume(prev,next);					     \
 } while (0)
 
 #define nop() __asm__ __volatile__ ("nop")

Are you sure it's not "last = resume(prev, next);"?

-- Pete

#2 lore raw
In reply to a message not in the archive
Quoted 11 lines
arch/s390/kernel/time.c +4 -0
@@ -202,14 +203,14 @@
 	unsigned long cr0;
 	__u64 timer;
 
+	timer = jiffies_timer_cc + jiffies_64 * CLK_TICKS_PER_JIFFY;
+	S390_lowcore.jiffy_timer = timer;
+	timer += CLK_TICKS_PER_JIFFY + CPU_DEVIATION;
+	asm volatile ("SCKC %0" : : "m" (timer));
         /* allow clock comparator timer interrupt */

arch/s390/kernel/time.c line 216

Quoted 10 lines
arch/s390/kernel/time.c +0 -4
         asm volatile ("STCTL 0,0,%0" : "=m" (cr0) : : "memory");
         cr0 |= 0x800;
         asm volatile ("LCTL 0,0,%0" : : "m" (cr0) : "memory");
-	timer = init_timer_cc + jiffies_64 * CLK_TICKS_PER_JIFFY;
-	S390_lowcore.jiffy_timer = timer;
-	timer += CLK_TICKS_PER_JIFFY + CPU_DEVIATION;
-	asm volatile ("SCKC %0" : : "m" (timer));
 }
 
 /*

This is a good fix, I confirm it fixing my booting problem ... on 2.4! Seriously, I can't believe it worked before. Please send it to Marcelo, too.

-- Pete