diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-03 15:27:31 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-03 15:27:33 +1100 |
| commit | 518619f74df435d43ea476d5bdecbd1a5d113149 (patch) | |
| tree | 992ccb3a0626fdd1ff3ae6ec1068d0b7da8335e0 /kernel/sched/clock.c | |
| parent | d7eaf400f583154283e26244ee671585cd413156 (diff) | |
| parent | c6294af3fa2f5b352c2de9ff1086cb236796a54c (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'kernel/sched/clock.c')
| -rw-r--r-- | kernel/sched/clock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched/clock.c b/kernel/sched/clock.c index b30a2924ef14..3ef6451e972e 100644 --- a/kernel/sched/clock.c +++ b/kernel/sched/clock.c @@ -60,13 +60,14 @@ #include <linux/sched.h> #include <linux/static_key.h> #include <linux/workqueue.h> +#include <linux/compiler.h> /* * Scheduler clock - returns current time in nanosec units. * This is default implementation. * Architectures and sub-architectures can override this. */ -unsigned long long __attribute__((weak)) sched_clock(void) +unsigned long long __weak sched_clock(void) { return (unsigned long long)(jiffies - INITIAL_JIFFIES) * (NSEC_PER_SEC / HZ); |