x86/cpu for v2.6.33
Subsystems (2)
Linus,
Please pull the latest x86-cpu-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-cpu-for-linus
Thanks,
Ingo
------------------>
Borislav Petkov (1):
x86, msr: Unify rdmsr_on_cpus/wrmsr_on_cpus
Frederic Weisbecker (1):
x86, msr: Remove the bkl from msr_open()
John Kacur (2):
x86, cpuid: Remove the bkl from cpuid_open() x86, cpuid: Simplify the code in cpuid_open
Matteo Croce (1):
x86: AMD Geode LX optimizations
Rusty Russell (1):
x86, msr, cpumask: Use struct cpumask rather than the deprecated cpumask_t
arch/x86/Kconfig.cpu | 2 +- arch/x86/Makefile_32.cpu | 2 +- arch/x86/include/asm/msr.h | 8 +++--- arch/x86/kernel/cpuid.c | 17 +++++---------- arch/x86/kernel/msr.c | 16 +++++--------- arch/x86/lib/msr.c | 46 ++++++++++++++++++------------------------- 6 files changed, 37 insertions(+), 54 deletions(-)
arch/x86/Kconfig.cpu +1 -1
@@ -406,7 +406,7 @@ config X86_CMPXCHG64 # generates cmov. config X86_CMOV def_bool y - depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM) + depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX) config X86_MINIMUM_CPU_FAMILY int
arch/x86/Makefile_32.cpu +1 -1
@@ -41,7 +41,7 @@ cflags-$(CONFIG_X86_ELAN) += -march=i486 # Geode GX1 support cflags-$(CONFIG_MGEODEGX1) += -march=pentium-mmx - +cflags-$(CONFIG_MGEODE_LX) += $(call cc-option,-march=geode,-march=pentium-mmx) # add at the end to overwrite eventual tuning options from earlier # cpu entries cflags-$(CONFIG_X86_GENERIC) += $(call tune,generic,$(call tune,i686))
arch/x86/include/asm/msr.h +4 -4
@@ -247,8 +247,8 @@ do { \#ifdef CONFIG_SMP int rdmsr_on_cpu (unsigned int cpu,u32 msr_no,u32 *l,u32 *h);int wrmsr_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h); -void rdmsr_on_cpus (const cpumask_t *mask,u32 msr_no,struct msr *msrs); -void wrmsr_on_cpus (const cpumask_t *mask,u32 msr_no,struct msr *msrs); +void rdmsr_on_cpus (const struct cpumask *mask,u32 msr_no,struct msr *msrs); +void wrmsr_on_cpus (const struct cpumask *mask,u32 msr_no,struct msr *msrs);int rdmsr_safe_on_cpu (unsigned int cpu,u32 msr_no,u32 *l,u32 *h);int wrmsr_safe_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h);int rdmsr_safe_regs_on_cpu (unsigned int cpu,u32 regs[8 ]);
@@ -264,12 +264,12 @@ static inline int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)wrmsr (msr_no, l, h);return 0 ; } -static inline void rdmsr_on_cpus (const cpumask_t *m,u32 msr_no, +static inline void rdmsr_on_cpus (const struct cpumask *m,u32 msr_no,struct msr *msrs) {rdmsr_on_cpu (0 , msr_no, &(msrs[0 ].l), &(msrs[0 ].h)); } -static inline void wrmsr_on_cpus (const cpumask_t *m,u32 msr_no, +static inline void wrmsr_on_cpus (const struct cpumask *m,u32 msr_no,struct msr *msrs) {wrmsr_on_cpu (0 , msr_no, msrs[0 ].l, msrs[0 ].h);
arch/x86/kernel/cpuid.c +6 -11
@@ -116,21 +116,16 @@ static int cpuid_open(struct inode *inode, struct file *file) {unsigned int cpu;struct cpuinfo_x86 *c; -int ret =0 ; - -lock_kernel (); cpu =iminor (file->f_path.dentry->d_inode); -if (cpu >= nr_cpu_ids || !cpu_online (cpu)) { - ret = -ENXIO ;/* No such CPU */ - goto out; - } +if (cpu >= nr_cpu_ids || !cpu_online (cpu)) +return -ENXIO ;/* No such CPU */ + c = &cpu_data (cpu);if (c->cpuid_level <0 ) - ret = -EIO ;/* CPUID not supported */ -out: -unlock_kernel (); -return ret; +return -EIO ;/* CPUID not supported */ + +return 0 ; }/*
arch/x86/kernel/msr.c +6 -10
@@ -174,21 +174,17 @@ static int msr_open(struct inode *inode, struct file *file) {unsigned int cpu =iminor (file->f_path.dentry->d_inode);struct cpuinfo_x86 *c = &cpu_data (cpu); -int ret =0 ; -lock_kernel (); cpu =iminor (file->f_path.dentry->d_inode); -if (cpu >= nr_cpu_ids || !cpu_online (cpu)) { - ret = -ENXIO ;/* No such CPU */ - goto out; - } +if (cpu >= nr_cpu_ids || !cpu_online (cpu)) +return -ENXIO ;/* No such CPU */ + c = &cpu_data (cpu);if (!cpu_has (c,X86_FEATURE_MSR )) - ret = -EIO ;/* MSR not supported */ -out: -unlock_kernel (); -return ret; +return -EIO ;/* MSR not supported */ + +return 0 ; }/*
arch/x86/lib/msr.c +19 -27
68 lines not on this page · raw message