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

Commit 62d7d7ed authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar
Browse files

x86: move the definition of set_iopl_mask to common header 



This patch moves the definition of set_iopl_mask to processor.h,
instead of letting it at processor_32.h.
For x86_64, nothing is done, as we don't really need such a function.
However, having it on both arches saves us from putting an ifdef in the
pv_cpu_ops struct.

Signed-off-by: default avatarGlauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 1b46cbe0

include/asm-x86/processor.h

+19 −0
Original line number Diff line number Diff line
@@ -78,6 +78,24 @@ static inline void native_set_debugreg(int regno, unsigned long value) 
	}

}



/*

 * Set IOPL bits in EFLAGS from given mask

 */

static inline void native_set_iopl_mask(unsigned mask)

{

#ifdef CONFIG_X86_32

	unsigned int reg;

	__asm__ __volatile__ ("pushfl;"

			      "popl %0;"

			      "andl %1, %0;"

			      "orl %2, %0;"

			      "pushl %0;"

			      "popfl"

				: "=&r" (reg)

				: "i" (~X86_EFLAGS_IOPL), "r" (mask));

#endif

}





#ifndef CONFIG_PARAVIRT

#define __cpuid native_cpuid
@@ -91,6 +109,7 @@ static inline void native_set_debugreg(int regno, unsigned long value) 
#define set_debugreg(value, register)				\

	native_set_debugreg(register, value)



#define set_iopl_mask native_set_iopl_mask

#endif /* CONFIG_PARAVIRT */



/*

include/asm-x86/processor_32.h

+0 −17
Original line number Diff line number Diff line
@@ -455,21 +455,6 @@ static inline void native_load_sp0(struct tss_struct *tss, struct thread_struct 
		wrmsr(MSR_IA32_SYSENTER_CS, thread->sysenter_cs, 0);

	}

}

/*

 * Set IOPL bits in EFLAGS from given mask

 */

static inline void native_set_iopl_mask(unsigned mask)

{

	unsigned int reg;

	__asm__ __volatile__ ("pushfl;"

			      "popl %0;"

			      "andl %1, %0;"

			      "orl %2, %0;"

			      "pushl %0;"

			      "popfl"

				: "=&r" (reg)

				: "i" (~X86_EFLAGS_IOPL), "r" (mask));

}



#ifdef CONFIG_PARAVIRT

#include <asm/paravirt.h>
@@ -479,8 +464,6 @@ static inline void load_sp0(struct tss_struct *tss, struct thread_struct *thread 
{

	native_load_sp0(tss, thread);

}



#define set_iopl_mask native_set_iopl_mask

#endif /* CONFIG_PARAVIRT */



/* generic versions from gas */