These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm64 / kernel / time.c

diff --git a/kernel/arch/arm64/kernel/time.c b/kernel/arch/arm64/kernel/time.c
index 42f9195..13339b6 100644 (file)
--- a/kernel/arch/arm64/kernel/time.c
+++ b/kernel/arch/arm64/kernel/time.c
@@ -42,7 +42,6 @@
 #include <asm/thread_info.h>
 #include <asm/stacktrace.h>
 
-#ifdef CONFIG_SMP
 unsigned long profile_pc(struct pt_regs *regs)
 {
        struct stackframe frame;
@@ -62,23 +61,16 @@ unsigned long profile_pc(struct pt_regs *regs)
        return frame.pc;
 }
 EXPORT_SYMBOL(profile_pc);
-#endif
 
 void __init time_init(void)
 {
        u32 arch_timer_rate;
 
        of_clk_init(NULL);
-       clocksource_of_init();
+       clocksource_probe();
 
        tick_setup_hrtimer_broadcast();
 
-       /*
-        * Since ACPI or FDT will only one be available in the system,
-        * we can use acpi_generic_timer_init() here safely
-        */
-       acpi_generic_timer_init();
-
        arch_timer_rate = arch_timer_get_rate();
        if (!arch_timer_rate)
                panic("Unable to initialise architected timer.\n");