m32r: make flush_cpumask non-volatile.

rustyrussell · torvalds · commit 1a9f064f516c · 2015-05-09T11:09:29.000-07:00
We cast away the volatile, but really, why make it volatile at all?
We already do a mb() inside the cpumask_empty() loop.

Signed-off-by: Rusty Russell &lt;rusty@rustcorp.com.au&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/arch/m32r/kernel/smp.c b/arch/m32r/kernel/smp.c
@@ -45,7 +45,7 @@ static volatile unsigned long flushcache_cpumask = 0;
 /*
  * For flush_tlb_others()
  */
-static volatile cpumask_t flush_cpumask;
+static cpumask_t flush_cpumask;
 static struct mm_struct *flush_mm;
 static struct vm_area_struct *flush_vma;
 static volatile unsigned long flush_va;
@@ -415,7 +415,7 @@ static void flush_tlb_others(cpumask_t cpumask, struct mm_struct *mm,
 	 */
 	send_IPI_mask(&cpumask, INVALIDATE_TLB_IPI, 0);
 
-	while (!cpumask_empty((cpumask_t*)&flush_cpumask)) {
+	while (!cpumask_empty(&flush_cpumask)) {
 		/* nothing. lockup detection does not belong here */
 		mb();
 	}
@@ -468,7 +468,7 @@ void smp_invalidate_interrupt(void)
 			__flush_tlb_page(va);
 		}
 	}
-	cpumask_clear_cpu(cpu_id, (cpumask_t*)&flush_cpumask);
+	cpumask_clear_cpu(cpu_id, &flush_cpumask);
 }
 
 /*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ static volatile unsigned long flushcache_cpumask = 0;`
`45`	`45`	`/*`
`46`	`46`	`* For flush_tlb_others()`
`47`	`47`	`*/`
`48`		`-static volatile cpumask_t flush_cpumask;`
	`48`	`+static cpumask_t flush_cpumask;`
`49`	`49`	`static struct mm_struct *flush_mm;`
`50`	`50`	`static struct vm_area_struct *flush_vma;`
`51`	`51`	`static volatile unsigned long flush_va;`
`@@ -415,7 +415,7 @@ static void flush_tlb_others(cpumask_t cpumask, struct mm_struct *mm,`
`415`	`415`	`*/`
`416`	`416`	`send_IPI_mask(&cpumask, INVALIDATE_TLB_IPI, 0);`
`417`	`417`
`418`		`- while (!cpumask_empty((cpumask_t*)&flush_cpumask)) {`
	`418`	`+ while (!cpumask_empty(&flush_cpumask)) {`
`419`	`419`	`/* nothing. lockup detection does not belong here */`
`420`	`420`	`mb();`
`421`	`421`	`}`
`@@ -468,7 +468,7 @@ void smp_invalidate_interrupt(void)`
`468`	`468`	`__flush_tlb_page(va);`
`469`	`469`	`}`
`470`	`470`	`}`
`471`		`- cpumask_clear_cpu(cpu_id, (cpumask_t*)&flush_cpumask);`
	`471`	`+ cpumask_clear_cpu(cpu_id, &flush_cpumask);`
`472`	`472`	`}`
`473`	`473`
`474`	`474`	`/======================================*/`