diff --git a/[refs] b/[refs] index 3677d4a06d94..213d4665eb5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d12cdd5f883f508d33b85c1bae98fa28987c8c7 +refs/heads/master: 7cbaef9c83e58bbd4bdd534b09052b6c5ec457d5 diff --git a/trunk/arch/x86/kernel/tsc.c b/trunk/arch/x86/kernel/tsc.c index 2ef80e301925..424093b157d3 100644 --- a/trunk/arch/x86/kernel/tsc.c +++ b/trunk/arch/x86/kernel/tsc.c @@ -55,7 +55,7 @@ u64 native_sched_clock(void) rdtscll(this_offset); /* return the value in ns */ - return cycles_2_ns(this_offset); + return __cycles_2_ns(this_offset); } /* We need to define a real function for sched_clock, to override the