projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
[linux-2.6-block.git]
/
kernel
/
posix-cpu-timers.c
diff --git
a/kernel/posix-cpu-timers.c
b/kernel/posix-cpu-timers.c
index 84d5cb372ed5b75282d27896f58374c74e67e389..42670e9b44e0830f92c4238236906904dd505b51 100644
(file)
--- a/
kernel/posix-cpu-timers.c
+++ b/
kernel/posix-cpu-timers.c
@@
-673,12
+673,12
@@
static void posix_cpu_timer_kick_nohz(void)
bool posix_cpu_timers_can_stop_tick(struct task_struct *tsk)
{
if (!task_cputime_zero(&tsk->cputime_expires))
bool posix_cpu_timers_can_stop_tick(struct task_struct *tsk)
{
if (!task_cputime_zero(&tsk->cputime_expires))
- return
tru
e;
+ return
fals
e;
if (tsk->signal->cputimer.running)
if (tsk->signal->cputimer.running)
- return
tru
e;
+ return
fals
e;
- return
fals
e;
+ return
tru
e;
}
#else
static inline void posix_cpu_timer_kick_nohz(void) { }
}
#else
static inline void posix_cpu_timer_kick_nohz(void) { }