[XFS] Restore the lowspace extent allocator algorithm

[safe/jmp/linux-2.6] / arch / m32r / kernel / time.c

diff --git a/arch/m32r/kernel/time.c b/arch/m32r/kernel/time.c
index a090382..994cc15 100644 (file)
--- a/arch/m32r/kernel/time.c
+++ b/arch/m32r/kernel/time.c
@@ -228,8 +228,12 @@ irqreturn_t timer_interrupt(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-struct irqaction irq0 = { timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE,
-                         "MFT2", NULL, NULL };
+struct irqaction irq0 = {
+       .handler = timer_interrupt,
+       .flags = IRQF_DISABLED,
+       .mask = CPU_MASK_NONE,
+       .name = "MFT2",
+};
 
 void __init time_init(void)
 {
@@ -286,11 +290,3 @@ void __init time_init(void)
 #error no chip configuration
 #endif
 }
-
-/*
- *  Scheduler clock - returns current time in nanosec units.
- */
-unsigned long long sched_clock(void)
-{
-       return (unsigned long long)jiffies * (1000000000 / HZ);
-}