vserver 2.0 rc7

[linux-2.6.git] / drivers / s390 / cio / cio.c

diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index b6e4d34..1d9b3f1 100644 (file)
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -1,7 +1,7 @@
 /*
  *  drivers/s390/cio/cio.c
  *   S/390 common I/O routines -- low level i/o calls
- *   $Revision: 1.130 $
+ *   $Revision: 1.133 $
  *
  *    Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
  *                           IBM Corporation
@@ -228,7 +228,7 @@ cio_start_key (struct subchannel *sch,      /* subchannel structure */
 int
 cio_start (struct subchannel *sch, struct ccw1 *cpa, __u8 lpm)
 {
-       return cio_start_key(sch, cpa, lpm, default_storage_key);
+       return cio_start_key(sch, cpa, lpm, PAGE_DEFAULT_KEY);
 }
 
 /*
@@ -608,6 +608,10 @@ do_IRQ (struct pt_regs *regs)
        irq_enter ();
        asm volatile ("mc 0,0");
        if (S390_lowcore.int_clock >= S390_lowcore.jiffy_timer)
+               /**
+                * Make sure that the i/o interrupt did not "overtake"
+                * the last HZ timer interrupt.
+                */
                account_ticks(regs);
        /*
         * Get interrupt information from lowcore