Skip to contentSkip to conversation

last minute s390 fixes for 2.6.27

GIT PULL Martin Schwidefsky 1 participant 1 message Oct 3, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi Linus,

please pull from 'for-linus' branch of

	git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus

to receive fixes for two regressions:

Heiko Carstens (1):

      [S390] nohz: Fix __udelay.

Jan Glauber (1):
[S390] qdio: prevent stack clobber

 arch/s390/kernel/time.c       |    2 +
 arch/s390/lib/delay.c         |   88 +++++++++++++++++++++++++----------------
 drivers/s390/cio/qdio_setup.c |   55 +++++++++----------------
 3 files changed, 76 insertions(+), 69 deletions(-)
arch/s390/kernel/time.c +2 -0
index ca114fe..06acb1a 100644
@@ -169,6 +169,8 @@ void init_cpu_timer(void)
 
 static void clock_comparator_interrupt(__u16 code)
 {
+	if (S390_lowcore.clock_comparator == -1ULL)
+		set_clock_comparator(S390_lowcore.clock_comparator);
 }
 
 static void etr_timing_alert(struct etr_irq_parm *);
arch/s390/lib/delay.c +54 -34

111 lines not on this page · raw message

drivers/s390/cio/qdio_setup.c +20 -35

71 lines not on this page · raw message