projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e2830b5
)
time: Fix legacy arch fallout
author
Thomas Gleixner
<
[email protected]
>
Tue, 1 Feb 2011 08:34:58 +0000
(09:34 +0100)
committer
Ingo Molnar
<
[email protected]
>
Tue, 1 Feb 2011 08:46:47 +0000
(09:46 +0100)
The xtime/dotimer cleanup broke architectures which do not implement
clockevents. Time to send out another __do_IRQ threat.
Signed-off-by: Thomas Gleixner <
[email protected]
>
Reported-by: Ingo Molnar <
[email protected]
>
Cc: Torben Hohn <
[email protected]
>
Cc: Peter Zijlstra <
[email protected]
>
Cc:
[email protected]
Cc:
[email protected]
Cc:
[email protected]
LKML-Reference: <
20110127145905
.23248.30458.stgit@localhost>
Signed-off-by: Ingo Molnar <
[email protected]
>
kernel/time/tick-internal.h
patch
|
blob
|
history
diff --git
a/kernel/time/tick-internal.h
b/kernel/time/tick-internal.h
index 28c578568c9dc8736fa0fcb63e00b101a6e9c940..f77b93df00069566a8eddfb5f3f16462778a6d5b 100644
(file)
--- a/
kernel/time/tick-internal.h
+++ b/
kernel/time/tick-internal.h
@@
-4,6
+4,8
@@
#include <linux/hrtimer.h>
#include <linux/tick.h>
+#ifdef CONFIG_GENERIC_CLOCKEVENTS_BUILD
+
#define TICK_DO_TIMER_NONE -1
#define TICK_DO_TIMER_BOOT -2
@@
-135,5
+137,7
@@
static inline int tick_device_is_functional(struct clock_event_device *dev)
return !(dev->features & CLOCK_EVT_FEAT_DUMMY);
}
+#endif
+
extern void do_timer(unsigned long ticks);
extern seqlock_t xtime_lock;