Commit bdb8c935 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Vasily Gorbik
Browse files

s390/mm: ensure switch_mm() is executed with interrupts disabled 



Architecture callback switch_mm() is allowed to be called with
enabled interrupts. However, our implementation of switch_mm()
does not expect that. Let's follow other architectures and make
sure switch_mm() is always executed with interrupts disabled,
regardless of what happens with the generic kernel code in the
future.

Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Reviewed-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 27c1dac0

arch/s390/include/asm/mmu_context.h

+13 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static inline int init_new_context(struct task_struct *tsk, 
	return 0;

}



static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,

static inline void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next,

				      struct task_struct *tsk)

{

	int cpu = smp_processor_id();
@@ -85,6 +85,17 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, 
	if (prev != next)

		cpumask_clear_cpu(cpu, &prev->context.cpu_attach_mask);

}

#define switch_mm_irqs_off switch_mm_irqs_off



static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,

			     struct task_struct *tsk)

{

	unsigned long flags;



	local_irq_save(flags);

	switch_mm_irqs_off(prev, next, tsk);

	local_irq_restore(flags);

}



#define finish_arch_post_lock_switch finish_arch_post_lock_switch

static inline void finish_arch_post_lock_switch(void)