diff options
author | Oliver Hartkopp <oliver@hartkopp.net> | 2008-04-30 17:04:37 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-03 12:11:48 -0400 |
commit | 4346f65426cbceb64794b468e4af6f5632d58c5e (patch) | |
tree | cd698a910a2526882d542984ccd314d109a5194a /kernel | |
parent | b66e1f11ebc429569a3784aaf64123633d9e3ed1 (diff) |
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.c | 9 |
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) | |||
154 | } | 154 | } |
155 | 155 | ||
156 | /* | 156 | /* |
157 | * Helper function to check, whether the timer is running the callback | ||
158 | * function | ||
159 | */ | ||
160 | static inline int hrtimer_callback_running(struct hrtimer *timer) | ||
161 | { | ||
162 | return timer->state & HRTIMER_STATE_CALLBACK; | ||
163 | } | ||
164 | |||
165 | /* | ||
166 | * Functions and macros which are different for UP/SMP systems are kept in a | 157 | * Functions and macros which are different for UP/SMP systems are kept in a |
167 | * single place | 158 | * single place |
168 | */ | 159 | */ |