diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-03-09 11:11:53 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-03-09 11:11:53 -0500 |
| commit | 548b84166917d6f5e2296123b85ad24aecd3801d (patch) | |
| tree | 0ab0300e23a02df0fe3c0579627e4998bb122c00 /include/linux/smp.h | |
| parent | cfb581bcd4f8c158c6f2b48bf5e232bb9e6855c0 (diff) | |
| parent | 57d54889cd00db2752994b389ba714138652e60c (diff) | |
Merge commit 'v2.6.34-rc1' into perf/urgent
Conflicts:
tools/perf/util/probe-event.c
Merge reason: Pick up -rc1 and resolve the conflict as well.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/smp.h')
| -rw-r--r-- | include/linux/smp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/smp.h b/include/linux/smp.h index 7a0570e6a596..cfa2d20e35f1 100644 --- a/include/linux/smp.h +++ b/include/linux/smp.h | |||
| @@ -154,7 +154,7 @@ smp_call_function_any(const struct cpumask *mask, void (*func)(void *info), | |||
| 154 | /* | 154 | /* |
| 155 | * smp_processor_id(): get the current CPU ID. | 155 | * smp_processor_id(): get the current CPU ID. |
| 156 | * | 156 | * |
| 157 | * if DEBUG_PREEMPT is enabled the we check whether it is | 157 | * if DEBUG_PREEMPT is enabled then we check whether it is |
| 158 | * used in a preemption-safe way. (smp_processor_id() is safe | 158 | * used in a preemption-safe way. (smp_processor_id() is safe |
| 159 | * if it's used in a preemption-off critical section, or in | 159 | * if it's used in a preemption-off critical section, or in |
| 160 | * a thread that is bound to the current CPU.) | 160 | * a thread that is bound to the current CPU.) |