summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorOliver Hartkopp <oliver@hartkopp.net>2008-04-30 23:04:37 +0200
committerThomas Gleixner <tglx@linutronix.de>2008-05-03 18:11:48 +0200
commit4346f65426cbceb64794b468e4af6f5632d58c5e (patch)
treecd698a910a2526882d542984ccd314d109a5194a /kernel
parentb66e1f11ebc429569a3784aaf64123633d9e3ed1 (diff)
downloadlwn-4346f65426cbceb64794b468e4af6f5632d58c5e.tar.gz
lwn-4346f65426cbceb64794b468e4af6f5632d58c5e.zip
hrtimer: remove duplicate helper function
The helper function hrtimer_callback_running() is used in kernel/hrtimer.c as well as in the updated net/can/bcm.c which now supports hrtimers. Moving the helper function to hrtimer.h removes the duplicate definition in the C-files. Signed-off-by: Oliver Hartkopp <oliver@hartkopp.net> Cc: David Miller <davem@davemloft.net> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/hrtimer.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 9af1d6a8095e..421be5fe5cc7 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -154,15 +154,6 @@ static void hrtimer_get_softirq_time(struct hrtimer_cpu_base *base)
}
/*
- * 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
*/