Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / arch / s390 / lib / delay.c

diff --git a/arch/s390/lib/delay.c b/arch/s390/lib/delay.c
index 0953cee05efc2d40cefcf8819c650de563462f6b..6ccb9fab055a5b08abb129bbd8752d11f1a0dd8c 100644 (file)
--- a/arch/s390/lib/delay.c
+++ b/arch/s390/lib/delay.c
@@ -92,3 +92,16 @@ out:
        local_irq_restore(flags);
        preempt_enable();
 }
+
+/*
+ * Simple udelay variant. To be used on startup and reboot
+ * when the interrupt handler isn't working.
+ */
+void udelay_simple(unsigned long usecs)
+{
+       u64 end;
+
+       end = get_clock() + ((u64) usecs << 12);
+       while (get_clock() < end)
+               cpu_relax();
+}