diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
| commit | a215aa7b9ab3759c047201199fba64d3042d7f13 (patch) | |
| tree | bca37493d9b2233450e6d3ffced1261d0e4f71fe /include/linux/sched.h | |
| parent | d31199a77ef606f1d06894385f1852181ba6136b (diff) | |
Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index c9ac4fc837ba..cdb9672a11ea 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -147,7 +147,7 @@ extern unsigned long nr_iowait_cpu(int cpu); | |||
| 147 | extern unsigned long this_cpu_load(void); | 147 | extern unsigned long this_cpu_load(void); |
| 148 | 148 | ||
| 149 | 149 | ||
| 150 | extern void calc_global_load(void); | 150 | extern void calc_global_load(unsigned long ticks); |
| 151 | 151 | ||
| 152 | extern unsigned long get_parent_ip(unsigned long addr); | 152 | extern unsigned long get_parent_ip(unsigned long addr); |
| 153 | 153 | ||