From e3df3fc003619bb1dd302bc11a3f6d1e7a989efa Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 5 Nov 2009 22:45:41 +1030 Subject: [PATCH] --- yaml --- r: 169983 b: refs/heads/master c: 0d0fbbddcc27c062815732b38c44b544e656c799 h: refs/heads/master i: 169981: 3efea8e44be062222282d27f494290d770f23e6e 169979: e7d68f223704ae8f78dba7b18fb39d193d2d918d 169975: 20db37326350564f121b3884cfbc1c7d735cac1c 169967: ba439aef3c10ee088652621a730c31466128dfdb 169951: 119af3ded34ddcf65e9d5d099dc3b0e1a212daa0 169919: 75f811ec983307d573947d7d35c3f5a0530c5778 169855: 5b68cb36ecc23ab6296e520e1651e18bcd5d9ea3 169727: bee6342f96705e69683fca04ab71f30f4b2d8542 169471: 81ebf2682c2b1c5ab9ba474f871d8bb3e1921e0f 168959: 490e891e24e0a04b0510893c3d96d1cea2de7e1b 167935: ae7cd49d750547632377570b6e14c79bc9d09918 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/msr.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1d10dd177525..0fe4e4aea0bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a943617ef52e9f79cd7cf437aad8870be27aabb +refs/heads/master: 0d0fbbddcc27c062815732b38c44b544e656c799 diff --git a/trunk/arch/x86/include/asm/msr.h b/trunk/arch/x86/include/asm/msr.h index 9a00219b331a..5bef931f8b14 100644 --- a/trunk/arch/x86/include/asm/msr.h +++ b/trunk/arch/x86/include/asm/msr.h @@ -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);