diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-22 01:34:26 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-22 01:34:26 -0500 |
| commit | 27a0464a6cb837d3a90b6e69365dfc01cb0dff2f (patch) | |
| tree | 361f00f4d4ad4c01b6144c52004bee2b948742ad /Documentation/local_ops.txt | |
| parent | 4d9d4ebf5de848e3450e23e4db9ac74e23e5daa6 (diff) | |
| parent | 3d44cc3e01ee1b40317f79ed54324e25c4f848df (diff) | |
[XFS] Fix merge conflict in fs/xfs/xfs_rename.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/xfs/xfs_rename.c
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
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) { |