diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2015-05-08 14:09:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-09 14:09:29 -0400 |
commit | 1a9f064f516c36d018754407b41921c996439ecf (patch) | |
tree | b531274e7672dd6edfe68100ce7c6ca3eeba6a4f | |
parent | 95c607d93f477bd4d079c0529c5f7becad4efffb (diff) |
m32r: make flush_cpumask non-volatile.
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 <rusty@rustcorp.com.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/m32r/kernel/smp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m32r/kernel/smp.c b/arch/m32r/kernel/smp.c index ce7aea34fdf4..c18ddc74ef9a 100644 --- a/arch/m32r/kernel/smp.c +++ b/arch/m32r/kernel/smp.c | |||
@@ -45,7 +45,7 @@ static volatile unsigned long flushcache_cpumask = 0; | |||
45 | /* | 45 | /* |
46 | * For flush_tlb_others() | 46 | * For flush_tlb_others() |
47 | */ | 47 | */ |
48 | static volatile cpumask_t flush_cpumask; | 48 | static cpumask_t flush_cpumask; |
49 | static struct mm_struct *flush_mm; | 49 | static struct mm_struct *flush_mm; |
50 | static struct vm_area_struct *flush_vma; | 50 | static struct vm_area_struct *flush_vma; |
51 | static volatile unsigned long flush_va; | 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 | send_IPI_mask(&cpumask, INVALIDATE_TLB_IPI, 0); | 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 | /* nothing. lockup detection does not belong here */ | 419 | /* nothing. lockup detection does not belong here */ |
420 | mb(); | 420 | mb(); |
421 | } | 421 | } |
@@ -468,7 +468,7 @@ void smp_invalidate_interrupt(void) | |||
468 | __flush_tlb_page(va); | 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 | /*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*/ |