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

Commit b4531e86 authored by Andi Kleen's avatar Andi Kleen Committed by Andi Kleen
Browse files

[PATCH] i386: Use X86_EFLAGS_IF in irqflags.h. 



Move X86_EFLAGS_IF et al out to a new header: processor-flags.h, so we
can include it from irqflags.h and use it in raw_irqs_disabled_flags().

As a side-effect, we could now use these flags in .S files.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 78eea47a

include/asm-i386/irqflags.h

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */

#ifndef _ASM_IRQFLAGS_H

#define _ASM_IRQFLAGS_H

#include <asm/processor-flags.h>



#ifndef __ASSEMBLY__

static inline unsigned long native_save_fl(void)
@@ -119,7 +120,7 @@ static inline unsigned long __raw_local_irq_save(void) 


static inline int raw_irqs_disabled_flags(unsigned long flags)

{

	return !(flags & (1 << 9));

	return !(flags & X86_EFLAGS_IF);

}



static inline int raw_irqs_disabled(void)

include/asm-i386/processor-flags.h

0 → 100644
+26 −0
Original line number Diff line number Diff line 
#ifndef __ASM_I386_PROCESSOR_FLAGS_H

#define __ASM_I386_PROCESSOR_FLAGS_H

/* Various flags defined: can be included from assembler. */



/*

 * EFLAGS bits

 */

#define X86_EFLAGS_CF	0x00000001 /* Carry Flag */

#define X86_EFLAGS_PF	0x00000004 /* Parity Flag */

#define X86_EFLAGS_AF	0x00000010 /* Auxillary carry Flag */

#define X86_EFLAGS_ZF	0x00000040 /* Zero Flag */

#define X86_EFLAGS_SF	0x00000080 /* Sign Flag */

#define X86_EFLAGS_TF	0x00000100 /* Trap Flag */

#define X86_EFLAGS_IF	0x00000200 /* Interrupt Flag */

#define X86_EFLAGS_DF	0x00000400 /* Direction Flag */

#define X86_EFLAGS_OF	0x00000800 /* Overflow Flag */

#define X86_EFLAGS_IOPL	0x00003000 /* IOPL mask */

#define X86_EFLAGS_NT	0x00004000 /* Nested Task */

#define X86_EFLAGS_RF	0x00010000 /* Resume Flag */

#define X86_EFLAGS_VM	0x00020000 /* Virtual Mode */

#define X86_EFLAGS_AC	0x00040000 /* Alignment Check */

#define X86_EFLAGS_VIF	0x00080000 /* Virtual Interrupt Flag */

#define X86_EFLAGS_VIP	0x00100000 /* Virtual Interrupt Pending */

#define X86_EFLAGS_ID	0x00200000 /* CPUID detection flag */



#endif	/* __ASM_I386_PROCESSOR_FLAGS_H */

include/asm-i386/processor.h

+1 −21
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <asm/percpu.h>

#include <linux/cpumask.h>

#include <linux/init.h>

#include <asm/processor-flags.h>



/* flag for disabling the tsc */

extern int tsc_disable;
@@ -126,27 +127,6 @@ extern void detect_ht(struct cpuinfo_x86 *c); 
static inline void detect_ht(struct cpuinfo_x86 *c) {}

#endif



/*

 * EFLAGS bits

 */

#define X86_EFLAGS_CF	0x00000001 /* Carry Flag */

#define X86_EFLAGS_PF	0x00000004 /* Parity Flag */

#define X86_EFLAGS_AF	0x00000010 /* Auxillary carry Flag */

#define X86_EFLAGS_ZF	0x00000040 /* Zero Flag */

#define X86_EFLAGS_SF	0x00000080 /* Sign Flag */

#define X86_EFLAGS_TF	0x00000100 /* Trap Flag */

#define X86_EFLAGS_IF	0x00000200 /* Interrupt Flag */

#define X86_EFLAGS_DF	0x00000400 /* Direction Flag */

#define X86_EFLAGS_OF	0x00000800 /* Overflow Flag */

#define X86_EFLAGS_IOPL	0x00003000 /* IOPL mask */

#define X86_EFLAGS_NT	0x00004000 /* Nested Task */

#define X86_EFLAGS_RF	0x00010000 /* Resume Flag */

#define X86_EFLAGS_VM	0x00020000 /* Virtual Mode */

#define X86_EFLAGS_AC	0x00040000 /* Alignment Check */

#define X86_EFLAGS_VIF	0x00080000 /* Virtual Interrupt Flag */

#define X86_EFLAGS_VIP	0x00100000 /* Virtual Interrupt Pending */

#define X86_EFLAGS_ID	0x00200000 /* CPUID detection flag */



static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,

					 unsigned int *ecx, unsigned int *edx)

{