git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[ARM] 3454/1: ARM: OMAP: 6/8 Update framebuffer low-level init code, take 2
[safe/jmp/linux-2.6]
/
kernel
/
timer.c
diff --git
a/kernel/timer.c
b/kernel/timer.c
index
9062a82
..
6b812c0
100644
(file)
--- a/
kernel/timer.c
+++ b/
kernel/timer.c
@@
-825,7
+825,7
@@
void update_process_times(int user_tick)
*/
static unsigned long count_active_tasks(void)
{
- return
(nr_running() + nr_uninterruptible()
) * FIXED_1;
+ return
nr_active(
) * FIXED_1;
}
/*