Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a90933fb authored by Hirokazu Takata's avatar Hirokazu Takata Committed by Linus Torvalds
Browse files

[PATCH] m32r: Fix smp.c for preempt kernel 



This patch fixes the following BUG message of arch/m32r/smp.c for
CONFIG_DEBUG_PREEMPT:

BUG: using smp_processor_id() in preemptible

This message is displayed by an smp_processor_id() execution during
kernel's preemptible-state.

Signed-off-by: default avatarHitoshi Yamamoto <hitoshiy@isl.melco.co.jp>
Signed-off-by: default avatarHirokazu Takata <takata@linux-m32r.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6593b58c

arch/m32r/kernel/smp.c

+8 −4
Original line number Diff line number Diff line
@@ -275,12 +275,14 @@ static void flush_tlb_all_ipi(void *info) 
 *==========================================================================*/

void smp_flush_tlb_mm(struct mm_struct *mm)

{

	int cpu_id = smp_processor_id();

	int cpu_id;

	cpumask_t cpu_mask;

	unsigned long *mmc = &mm->context[cpu_id];

	unsigned long *mmc;

	unsigned long flags;



	preempt_disable();

	cpu_id = smp_processor_id();

	mmc = &mm->context[cpu_id];

	cpu_mask = mm->cpu_vm_mask;

	cpu_clear(cpu_id, cpu_mask);
@@ -343,12 +345,14 @@ void smp_flush_tlb_range(struct vm_area_struct *vma, unsigned long start, 
void smp_flush_tlb_page(struct vm_area_struct *vma, unsigned long va)

{

	struct mm_struct *mm = vma->vm_mm;

	int cpu_id = smp_processor_id();

	int cpu_id;

	cpumask_t cpu_mask;

	unsigned long *mmc = &mm->context[cpu_id];

	unsigned long *mmc;

	unsigned long flags;



	preempt_disable();

	cpu_id = smp_processor_id();

	mmc = &mm->context[cpu_id];

	cpu_mask = mm->cpu_vm_mask;

	cpu_clear(cpu_id, cpu_mask);