diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-19 10:37:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-19 10:37:37 -0800 |
| commit | 21228e455756be11fbbcae7e1a184ad9d842f687 (patch) | |
| tree | 594ff10478aed5f264294e8a718e80a3e44ab34c /include/linux | |
| parent | 0a59228168d3722b71f8e3dbc623316fb4be78f4 (diff) | |
| parent | 8e92c20183ed0579d94501311b81c42b65cb2129 (diff) | |
| download | linux-21228e455756be11fbbcae7e1a184ad9d842f687.tar.gz linux-21228e455756be11fbbcae7e1a184ad9d842f687.tar.bz2 linux-21228e455756be11fbbcae7e1a184ad9d842f687.zip | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: Fix the irqtime code for 32bit
sched: Fix the irqtime code to deal with u64 wraps
nohz: Fix get_next_timer_interrupt() vs cpu hotplug
Sched: fix skip_clock_update optimization
sched: Cure more NO_HZ load average woes
Diffstat (limited to 'include/linux')
| -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 2c79e921a68b..223874538b33 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -143,7 +143,7 @@ extern unsigned long nr_iowait_cpu(int cpu); extern unsigned long this_cpu_load(void); -extern void calc_global_load(void); +extern void calc_global_load(unsigned long ticks); extern unsigned long get_parent_ip(unsigned long addr); |