diff options
author | David Vrabel <david.vrabel@csr.com> | 2008-12-08 11:18:47 -0500 |
---|---|---|
committer | David Vrabel <david.vrabel@csr.com> | 2008-12-08 11:18:47 -0500 |
commit | c35fa3ea1ae8198bd65c2c6e59d9ebd68c115a59 (patch) | |
tree | 878768b69df25459b448aa890352342c4a3c6e2d /Documentation/local_ops.txt | |
parent | dcc7461eef7341e84e2f7274f904ce01a43b2506 (diff) | |
parent | 218d11a8b071b23b76c484fd5f72a4fe3306801e (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'Documentation/local_ops.txt')
-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) { |