diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:12:20 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:12:20 -0400 |
| commit | 165415f700b0c77fa1f8db6198f48582639adf78 (patch) | |
| tree | 088e305b0b5b0c6753072e13be1177824c3ed59d /include/asm-x86_64/smp.h | |
| parent | c324b44c34050cf2a9b58830e11c974806bd85d8 (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/asm-x86_64/smp.h')
| -rw-r--r-- | include/asm-x86_64/smp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/smp.h b/include/asm-x86_64/smp.h index de8b57b2b62b..24e32611f0bf 100644 --- a/include/asm-x86_64/smp.h +++ b/include/asm-x86_64/smp.h | |||
| @@ -72,7 +72,7 @@ static inline int num_booting_cpus(void) | |||
| 72 | 72 | ||
| 73 | #define raw_smp_processor_id() read_pda(cpunumber) | 73 | #define raw_smp_processor_id() read_pda(cpunumber) |
| 74 | 74 | ||
| 75 | extern __inline int hard_smp_processor_id(void) | 75 | static inline int hard_smp_processor_id(void) |
| 76 | { | 76 | { |
| 77 | /* we don't want to mark this access volatile - bad code generation */ | 77 | /* we don't want to mark this access volatile - bad code generation */ |
| 78 | return GET_APIC_ID(*(unsigned int *)(APIC_BASE+APIC_ID)); | 78 | return GET_APIC_ID(*(unsigned int *)(APIC_BASE+APIC_ID)); |