diff options
| author | Adrian Bunk <bunk@stusta.de> | 2007-02-20 01:07:13 +0100 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2007-02-20 20:29:37 +0100 |
| commit | b44755cfaa72e7ed3d831a946bb4e7dfe7548966 (patch) | |
| tree | 251cf0ab5aa9c39bab3f0981ab96021b5523bee3 /include | |
| parent | [CPUFREQ] cpufreq_ondemand.c: don't use _WORK_NAR (diff) | |
| download | linux-b44755cfaa72e7ed3d831a946bb4e7dfe7548966.tar.xz linux-b44755cfaa72e7ed3d831a946bb4e7dfe7548966.zip | |
{rd,wr}msr_on_cpu SMP=n optimization
Let's save a few bytes in the CONFIG_SMP=n case.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/msr.h | 11 | ||||
| -rw-r--r-- | include/asm-x86_64/msr.h | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/include/asm-i386/msr.h b/include/asm-i386/msr.h index 3516a1fb38e0..8c35f3d90a89 100644 --- a/include/asm-i386/msr.h +++ b/include/asm-i386/msr.h @@ -83,8 +83,19 @@ static inline void wrmsrl (unsigned long msr, unsigned long long val) : "c" (counter)) #endif /* !CONFIG_PARAVIRT */ +#ifdef CONFIG_SMP void rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h); void wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h); +#else /* CONFIG_SMP */ +static inline void rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h) +{ + rdmsr(msr_no, *l, *h); +} +static inline void wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h) +{ + wrmsr(msr_no, l, h); +} +#endif /* CONFIG_SMP */ /* symbolic names for some interesting MSRs */ /* Intel defined MSRs. */ diff --git a/include/asm-x86_64/msr.h b/include/asm-x86_64/msr.h index 995a2b5fb26b..902f9a58617e 100644 --- a/include/asm-x86_64/msr.h +++ b/include/asm-x86_64/msr.h @@ -160,8 +160,19 @@ static inline unsigned int cpuid_edx(unsigned int op) #define MSR_IA32_UCODE_WRITE 0x79 #define MSR_IA32_UCODE_REV 0x8b +#ifdef CONFIG_SMP void rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h); void wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h); +#else /* CONFIG_SMP */ +static inline void rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h) +{ + rdmsr(msr_no, *l, *h); +} +static inline void wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h) +{ + wrmsr(msr_no, l, h); +} +#endif /* CONFIG_SMP */ #endif |