diff options
| author | Jaroslav Kysela <perex@petra> | 2005-06-22 06:19:24 -0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@petra> | 2005-06-22 06:19:24 -0400 |
| commit | da04b128cf0d74dd4cab270c53d9264e70f9203e (patch) | |
| tree | 095355c32dfd709236a85b497d3bd461d7cdfe8a /include/asm-s390/smp.h | |
| parent | fae6ec69c84d71b1d5bda9ede1a262c1681684aa (diff) | |
| parent | 2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-s390/smp.h')
| -rw-r--r-- | include/asm-s390/smp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-s390/smp.h b/include/asm-s390/smp.h index 9473786387a3..dd50e57a928f 100644 --- a/include/asm-s390/smp.h +++ b/include/asm-s390/smp.h | |||
| @@ -47,7 +47,7 @@ extern int smp_call_function_on(void (*func) (void *info), void *info, | |||
| 47 | 47 | ||
| 48 | #define PROC_CHANGE_PENALTY 20 /* Schedule penalty */ | 48 | #define PROC_CHANGE_PENALTY 20 /* Schedule penalty */ |
| 49 | 49 | ||
| 50 | #define smp_processor_id() (S390_lowcore.cpu_data.cpu_nr) | 50 | #define raw_smp_processor_id() (S390_lowcore.cpu_data.cpu_nr) |
| 51 | 51 | ||
| 52 | extern int smp_get_cpu(cpumask_t cpu_map); | 52 | extern int smp_get_cpu(cpumask_t cpu_map); |
| 53 | extern void smp_put_cpu(int cpu); | 53 | extern void smp_put_cpu(int cpu); |