Merge branch 'linus' into x86/amd-iommu

[~andy/linux] / kernel / sched_clock.c

diff --git a/kernel/sched_clock.c b/kernel/sched_clock.c
index 8affbfd0cdb0fda3aa3679c8a0a7960671dbf13b..22ed55d1167f3b4aa2f1c820ab78f97842f2df1b 100644 (file)
--- a/kernel/sched_clock.c
+++ b/kernel/sched_clock.c
@@ -330,3 +330,16 @@ unsigned long long __attribute__((weak)) sched_clock(void)
 {
        return (unsigned long long)jiffies * (NSEC_PER_SEC / HZ);
 }
+
+unsigned long long cpu_clock(int cpu)
+{
+       unsigned long long clock;
+       unsigned long flags;
+
+       local_irq_save(flags);
+       clock = sched_clock_cpu(cpu);
+       local_irq_restore(flags);
+
+       return clock;
+}
+EXPORT_SYMBOL_GPL(cpu_clock);