projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'nfs-for-4.8-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
[linux-block.git]
/
include
/
linux
/
timer.h
diff --git
a/include/linux/timer.h
b/include/linux/timer.h
index 4419506b564ecc215b9550b9e1bf4ed4ccbe6e29..51d601f192d421c6e3721c6621d7c3e08dc1a54d 100644
(file)
--- a/
include/linux/timer.h
+++ b/
include/linux/timer.h
@@
-273,4
+273,10
@@
unsigned long __round_jiffies_up_relative(unsigned long j, int cpu);
unsigned long round_jiffies_up(unsigned long j);
unsigned long round_jiffies_up_relative(unsigned long j);
+#ifdef CONFIG_HOTPLUG_CPU
+int timers_dead_cpu(unsigned int cpu);
+#else
+#define timers_dead_cpu NULL
+#endif
+
#endif