Merge with Linux 2.4.0-test9. Please check DECstation, I had a number

of rejects to fixup while integrating Linus patches.  I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages.  I commit this anyway
since I found that the last CVS versions had the same problem.

1 files changed, 23 insertions, 8 deletions

diff --git a/arch/arm/kernel/leds-ebsa110.c b/arch/arm/kernel/leds-ebsa110.c
index 7b2c886ef..17cb356e4 100644
--- a/arch/arm/kernel/leds-ebsa110.c
+++ b/arch/arm/kernel/leds-ebsa110.c
@@ -1,23 +1,32 @@
 /*
- * arch/arm/kernel/leds-ebsa110.c
+ *  linux/arch/arm/kernel/leds-ebsa110.c
  *
- * Copyright (C) 1998 Russell King
+ *  Copyright (C) 1998 Russell King
  *
- * EBSA-110 LED control routines.  We use the led as follows:
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
- *  - Red - toggles state every 50 timer interrupts
+ *  EBSA-110 LED control routines.  We use the led as follows:
+ *
+ *   - Red - toggles state every 50 timer interrupts
  */
 #include <linux/module.h>
+#include <linux/spinlock.h>
+#include <linux/init.h>
 
 #include <asm/hardware.h>
 #include <asm/leds.h>
 #include <asm/system.h>
+#include <asm/mach-types.h>
+
+static spinlock_t leds_lock;
 
 static void ebsa110_leds_event(led_event_t ledevt)
 {
 	unsigned long flags;
 
-	save_flags_cli(flags);
+	spin_lock_irqsave(&leds_lock, flags);
 
 	switch(ledevt) {
 	case led_timer:
@@ -28,9 +37,15 @@ static void ebsa110_leds_event(led_event_t ledevt)
 		break;
 	}
 
-	restore_flags(flags);
+	spin_unlock_irqrestore(&leds_lock, flags);
 }
 
-void (*leds_event)(led_event_t) = ebsa110_leds_event;
+static int __init leds_init(void)
+{
+	if (machine_is_ebsa110())
+		leds_event = ebsa110_leds_event;
+
+	return 0;
+}
 
-EXPORT_SYMBOL(leds_event);
+__initcall(leds_init);