Merge git://www.linux-watchdog.org/linux-watchdog

[karo-tx-linux.git] / arch / sparc / kernel / setup_64.c

diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c
index 422b178809557c13345c312db96ec1cb893e50e6..4d9c3e13c15056b5d60e7ccd266b36cfe29d2c00 100644 (file)
--- a/arch/sparc/kernel/setup_64.c
+++ b/arch/sparc/kernel/setup_64.c
@@ -95,7 +95,7 @@ static struct console prom_early_console = {
        .index =        -1,
 };
 
-/* 
+/*
  * Process kernel command line switches that are specific to the
  * SPARC or that require special low-level processing.
  */
@@ -365,6 +365,7 @@ void __init start_early_boot(void)
        }
        current_thread_info()->cpu = cpu;
 
+       time_init_early();
        prom_init_report();
        start_kernel();
 }
@@ -639,7 +640,7 @@ void __init setup_arch(char **cmdline_p)
 #ifdef CONFIG_BLK_DEV_RAM
        rd_image_start = ram_flags & RAMDISK_IMAGE_START_MASK;
        rd_prompt = ((ram_flags & RAMDISK_PROMPT_FLAG) != 0);
-       rd_doload = ((ram_flags & RAMDISK_LOAD_FLAG) != 0);     
+       rd_doload = ((ram_flags & RAMDISK_LOAD_FLAG) != 0);
 #endif
 
        task_thread_info(&init_task)->kregs = &fake_swapper_regs;
@@ -648,7 +649,7 @@ void __init setup_arch(char **cmdline_p)
        if (!ic_set_manually) {
                phandle chosen = prom_finddevice("/chosen");
                u32 cl, sv, gw;
-               
+
                cl = prom_getintdefault (chosen, "client-ip", 0);
                sv = prom_getintdefault (chosen, "server-ip", 0);
                gw = prom_getintdefault (chosen, "gateway-ip", 0);