diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
| commit | b74b953b998bcc2db91b694446f3a2619ec32de6 (patch) | |
| tree | 6ce24caabd730f6ae9287ed0676ec32e6ff31e9d /include/linux/smp.h | |
| parent | abb438526201c6a79949ad45375c051b6681c253 (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).
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.) |