cpumask: use struct cpumask rather than the deprecated cpumask_t

PATCH In review Rusty Russell 2 participants 2 messages Nov 3, 2009 – Nov 4, 2009 x86

lore

Share & tools

lore

Rusty Russell

author

2009-11-03 04:24 UTC #0 lore raw

PATCH 4/14 cpumask: use struct cpumask rather than the deprecated cpumask_t

Signed-off-by Rusty Russell <[email protected]>

To: Ingo Molnar <[email protected]>

---
 arch/x86/include/asm/msr.h |    4 ++--
 arch/x86/lib/msr.c         |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

arch/x86/include/asm/msr.h +2 -2

@@ -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]);

arch/x86/lib/msr.c +2 -2

@@ -78,7 +78,7 @@ EXPORT_SYMBOL(wrmsr_on_cpu);
  * @msrs:       array of MSR values
  *
  */
-void rdmsr_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)
 {
 	struct msr_info rv;
 	int this_cpu;

@@ -107,7 +107,7 @@ EXPORT_SYMBOL(rdmsr_on_cpus);
  * @msrs:       array of MSR values
  *
  */
-void wrmsr_on_cpus(const cpumask_t *mask, u32 msr_no, struct msr *msrs)
+void wrmsr_on_cpus(const struct cpumask *mask, u32 msr_no, struct msr *msrs)
 {
 	struct msr_info rv;
 	int this_cpu;

Ingo Molnar

2009-11-04 12:15 UTC #1 lore raw

Quoted 6 lines · Rusty Russell

Signed-off-by Rusty Russell <[email protected]>
To: Ingo Molnar <[email protected]>
---
 arch/x86/include/asm/msr.h |    4 ++--
 arch/x86/lib/msr.c         |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Mind sending this against latest -tip? We already have:

b8a4754: x86, msr: Unify rdmsr_on_cpus/wrmsr_on_cpus

which makes your patch not apply:

patching file arch/x86/include/asm/msr.h
Hunk #1 FAILED at 247.
1 out of 1 hunk FAILED -- rejects in file arch/x86/include/asm/msr.h patching file arch/x86/lib/msr.c
Hunk #1 FAILED at 78.
Hunk #2 FAILED at 107.
2 out of 2 hunks FAILED -- rejects in file arch/x86/lib/msr.c

Thanks,

Ingo