projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
hrtimer.c
diff --git
a/kernel/hrtimer.c
b/kernel/hrtimer.c
index 9af1d6a8095e40f80e64cdade6c0c3b505184466..421be5fe5cc78f5d2be0eabd3ba2367fe1b15b3e 100644
(file)
--- a/
kernel/hrtimer.c
+++ b/
kernel/hrtimer.c
@@
-153,15
+153,6
@@
static void hrtimer_get_softirq_time(struct hrtimer_cpu_base *base)
ktime_add(xtim, tomono);
}
ktime_add(xtim, tomono);
}
-/*
- * Helper function to check, whether the timer is running the callback
- * function
- */
-static inline int hrtimer_callback_running(struct hrtimer *timer)
-{
- return timer->state & HRTIMER_STATE_CALLBACK;
-}
-
/*
* Functions and macros which are different for UP/SMP systems are kept in a
* single place
/*
* Functions and macros which are different for UP/SMP systems are kept in a
* single place