diff --git a/[refs] b/[refs] index c6d6e348f168..47c4c51caeb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c9fe8ad813b257a2b9ddf0f752105a75a7dae63 +refs/heads/master: 2d452c9b10caeec455eb5e56a0ef4ed485178213 diff --git a/trunk/kernel/sched_clock.c b/trunk/kernel/sched_clock.c index ed5a8c415046..60094e257a9a 100644 --- a/trunk/kernel/sched_clock.c +++ b/trunk/kernel/sched_clock.c @@ -250,9 +250,9 @@ unsigned long long cpu_clock(int cpu) unsigned long long clock; unsigned long flags; - raw_local_irq_save(flags); + local_irq_save(flags); clock = sched_clock_cpu(cpu); - raw_local_irq_restore(flags); + local_irq_restore(flags); return clock; }