+ m68k-atari-interrupt-updates.patch added to -mm tree

[akpm@xxxxxxxx]

The patch titled

     m68k/Atari: Interrupt updates

has been added to the -mm tree.  Its filename is

     m68k-atari-interrupt-updates.patch

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: m68k/Atari: Interrupt updates
From: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>

Misc Atari fixes:
  - initialize correct number of atari irqs
  - silence vbl interrupt until it's used by atafb
  - use mdelay() to read clock if necessary

Signed-off-by: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 arch/m68k/atari/ataints.c |    9 +++++++--
 arch/m68k/atari/time.c    |    9 +++++++--
 arch/m68k/kernel/ints.c   |    1 +
 3 files changed, 15 insertions(+), 4 deletions(-)

diff -puN arch/m68k/atari/ataints.c~m68k-atari-interrupt-updates arch/m68k/atari/ataints.c
--- a/arch/m68k/atari/ataints.c~m68k-atari-interrupt-updates
+++ a/arch/m68k/atari/ataints.c
@@ -332,6 +332,9 @@ static void atari_shutdown_irq(unsigned 
 	atari_disable_irq(irq);
 	atari_turnoff_irq(irq);
 	m68k_irq_shutdown(irq);
+
+	if (irq == IRQ_AUTO_4)
+	    vectors[VEC_INT4] = falcon_hblhandler;
 }
 
 static struct irq_controller atari_irq_controller = {
@@ -356,7 +359,7 @@ static struct irq_controller atari_irq_c
 
 void __init atari_init_IRQ(void)
 {
-	m68k_setup_user_interrupt(VEC_USER, 192, NULL);
+	m68k_setup_user_interrupt(VEC_USER, NUM_ATARI_SOURCES - IRQ_USER, NULL);
 	m68k_setup_irq_controller(&atari_irq_controller, 1, NUM_ATARI_SOURCES - 1);
 
 	/* Initialize the MFP(s) */
@@ -403,8 +406,10 @@ void __init atari_init_IRQ(void)
 		 * gets overruns)
 		 */
 
-		if (!MACH_IS_HADES)
+		if (!MACH_IS_HADES) {
 			vectors[VEC_INT2] = falcon_hblhandler;
+			vectors[VEC_INT4] = falcon_hblhandler;
+		}
 	}
 
 	if (ATARIHW_PRESENT(PCM_8BIT) && ATARIHW_PRESENT(MICROWIRE)) {
diff -puN arch/m68k/atari/time.c~m68k-atari-interrupt-updates arch/m68k/atari/time.c
--- a/arch/m68k/atari/time.c~m68k-atari-interrupt-updates
+++ a/arch/m68k/atari/time.c
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/rtc.h>
 #include <linux/bcd.h>
+#include <linux/delay.h>
 
 #include <asm/atariints.h>
 
@@ -212,8 +213,12 @@ int atari_tt_hwclk( int op, struct rtc_t
      * additionally the RTC_SET bit is set to prevent an update cycle.
      */
 
-    while( RTC_READ(RTC_FREQ_SELECT) & RTC_UIP )
-        schedule_timeout_interruptible(HWCLK_POLL_INTERVAL);
+    while( RTC_READ(RTC_FREQ_SELECT) & RTC_UIP ) {
+	if (in_atomic() || irqs_disabled())
+	    mdelay(1);
+	else
+	    schedule_timeout_interruptible(HWCLK_POLL_INTERVAL);
+    }
 
     local_irq_save(flags);
     RTC_WRITE( RTC_CONTROL, ctrl | RTC_SET );
diff -puN arch/m68k/kernel/ints.c~m68k-atari-interrupt-updates arch/m68k/kernel/ints.c
--- a/arch/m68k/kernel/ints.c~m68k-atari-interrupt-updates
+++ a/arch/m68k/kernel/ints.c
@@ -132,6 +132,7 @@ void __init m68k_setup_user_interrupt(un
 {
 	int i;
 
+	BUG_ON(IRQ_USER + cnt >= NR_IRQS);
 	m68k_first_user_vec = vec;
 	for (i = 0; i < cnt; i++)
 		irq_controller[IRQ_USER + i] = &user_irq_controller;
_

Patches currently in -mm which might be from geert@xxxxxxxxxxxxxx are

m68k-syscall-updates.patch
m68k-hp300-enable-hil-configuration-options.patch
m68k-atari-interrupt-updates.patch
m68k-apollo-remove-obsolete-arch-m68k-apollo-dmac.patch
m68k-mvme167-serial167-is-no-longer-broken.patch
m68k-mvme167-serial167-tty-flip-buffer-updates.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html