From: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>

When parsing the boot parameters, IRQ is still disabled. Don't enable
it too early.

Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 kernel/time/clocksource.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff -puN kernel/time/clocksource.c~time-clocksource-infrastructure-dont-enable-irq-too-early kernel/time/clocksource.c
--- 25/kernel/time/clocksource.c~time-clocksource-infrastructure-dont-enable-irq-too-early	Fri Mar 24 13:57:28 2006
+++ 25-akpm/kernel/time/clocksource.c	Fri Mar 24 13:57:28 2006
@@ -317,10 +317,11 @@ device_initcall(init_clocksource_sysfs);
  */
 static int __init boot_override_clocksource(char* str)
 {
-	spin_lock_irq(&clocksource_lock);
+	unsigned long flags;
+	spin_lock_irqsave(&clocksource_lock, flags);
 	if (str)
 		strlcpy(override_name, str, sizeof(override_name));
-	spin_unlock_irq(&clocksource_lock);
+	spin_unlock_irqrestore(&clocksource_lock, flags);
 	return 1;
 }
 
_