git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into sched/core
[pandora-kernel.git]
/
include
/
linux
/
sched.h
diff --git
a/include/linux/sched.h
b/include/linux/sched.h
index
ff154e1
..
9a7bc5b
100644
(file)
--- a/
include/linux/sched.h
+++ b/
include/linux/sched.h
@@
-139,7
+139,7
@@
extern int nr_processes(void);
extern unsigned long nr_running(void);
extern unsigned long nr_uninterruptible(void);
extern unsigned long nr_iowait(void);
extern unsigned long nr_running(void);
extern unsigned long nr_uninterruptible(void);
extern unsigned long nr_iowait(void);
-extern unsigned long nr_iowait_cpu(
void
);
+extern unsigned long nr_iowait_cpu(
int cpu
);
extern unsigned long this_cpu_load(void);
extern unsigned long this_cpu_load(void);