aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/sched.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-07-05 08:30:55 +0200
committerIngo Molnar <mingo@elte.hu>2010-07-05 08:30:58 +0200
commit08f8ba07998ab1b9efcdd3f28dadf6866a605ddb (patch)
tree8e09855446f7b0312bb729d4b539090756e57927 /include/linux/sched.h
parent0879b100f3c187257729f36cba33d96ec2875766 (diff)
parent815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff)
downloadkernel_samsung_smdk4412-08f8ba07998ab1b9efcdd3f28dadf6866a605ddb.zip
kernel_samsung_smdk4412-08f8ba07998ab1b9efcdd3f28dadf6866a605ddb.tar.gz
kernel_samsung_smdk4412-08f8ba07998ab1b9efcdd3f28dadf6866a605ddb.tar.bz2
Merge commit 'v2.6.35-rc4' into perf/core
Merge reason: Pick up the latest perf fixes Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r--include/linux/sched.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index f118809..747fcae 100644
--- 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_iowait_cpu(void);
+extern unsigned long nr_iowait_cpu(int cpu);
extern unsigned long this_cpu_load(void);