diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 07:48:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 07:48:57 -0500 |
| commit | 45ab6b0c76d0e4cce5bd608ccf97b0f6b20f18df (patch) | |
| tree | 4d51c73533c386aee16fde1e74b5e3bc22eedc53 /Documentation | |
| parent | 81444a799550214f549caf579cf65a0ca55e70b7 (diff) | |
| parent | d65bd5ecb2bd166cea4952a59b7e16cc3ad6ef6c (diff) | |
Merge branch 'sched/core' into cpus4096
Conflicts:
include/linux/ftrace.h
kernel/sched.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/local_ops.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/local_ops.txt b/Documentation/local_ops.txt index f4f8b1c6c8ba..23045b8b50f0 100644 --- a/Documentation/local_ops.txt +++ b/Documentation/local_ops.txt | |||
| @@ -149,7 +149,7 @@ static void do_test_timer(unsigned long data) | |||
| 149 | int cpu; | 149 | int cpu; |
| 150 | 150 | ||
| 151 | /* Increment the counters */ | 151 | /* Increment the counters */ |
| 152 | on_each_cpu(test_each, NULL, 0, 1); | 152 | on_each_cpu(test_each, NULL, 1); |
| 153 | /* Read all the counters */ | 153 | /* Read all the counters */ |
| 154 | printk("Counters read from CPU %d\n", smp_processor_id()); | 154 | printk("Counters read from CPU %d\n", smp_processor_id()); |
| 155 | for_each_online_cpu(cpu) { | 155 | for_each_online_cpu(cpu) { |