diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 08:39:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 08:39:09 -0400 |
| commit | d2f6409584e2c62ffad81690562330ff3bf4a458 (patch) | |
| tree | 3bdfb97d0b51be2f7f414f2107e97603c1206abb /include/asm-um/smp.h | |
| parent | e1b09eba2686eca94a3a188042b518df6044a3c1 (diff) | |
| parent | 4a89a04f1ee21a7c1f4413f1ad7dcfac50ff9b63 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-um/smp.h')
| -rw-r--r-- | include/asm-um/smp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-um/smp.h b/include/asm-um/smp.h index 4412d5d9c26b..d879eba2b52c 100644 --- a/include/asm-um/smp.h +++ b/include/asm-um/smp.h | |||
| @@ -8,7 +8,8 @@ | |||
| 8 | #include "asm/current.h" | 8 | #include "asm/current.h" |
| 9 | #include "linux/cpumask.h" | 9 | #include "linux/cpumask.h" |
| 10 | 10 | ||
| 11 | #define smp_processor_id() (current_thread->cpu) | 11 | #define raw_smp_processor_id() (current_thread->cpu) |
| 12 | |||
| 12 | #define cpu_logical_map(n) (n) | 13 | #define cpu_logical_map(n) (n) |
| 13 | #define cpu_number_map(n) (n) | 14 | #define cpu_number_map(n) (n) |
| 14 | #define PROC_CHANGE_PENALTY 15 /* Pick a number, any number */ | 15 | #define PROC_CHANGE_PENALTY 15 /* Pick a number, any number */ |