Commit 5d02d7ae authored by Andi Kleen's avatar Andi Kleen Committed by Andi Kleen
Browse files

[PATCH] x86-64: Use X86_EFLAGS_IF in x86-64/irqflags.h. 



As per i386 patch: 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 b92e9fac

include/asm-x86_64/irqflags.h

+5 −4
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__

/*
@@ -53,19 +54,19 @@ static inline void raw_local_irq_disable(void) 
{

	unsigned long flags = __raw_local_save_flags();



	raw_local_irq_restore((flags & ~(1 << 9)) | (1 << 18));

	raw_local_irq_restore((flags & ~X86_EFLAGS_IF) | X86_EFLAGS_AC);

}



static inline void raw_local_irq_enable(void)

{

	unsigned long flags = __raw_local_save_flags();



	raw_local_irq_restore((flags | (1 << 9)) & ~(1 << 18));

	raw_local_irq_restore((flags | X86_EFLAGS_IF) & (~X86_EFLAGS_AC));

}



static inline int raw_irqs_disabled_flags(unsigned long flags)

{

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

	return !(flags & X86_EFLAGS_IF) || (flags & X86_EFLAGS_AC);

}



#else /* CONFIG_X86_VSMP */
@@ -82,7 +83,7 @@ static inline void raw_local_irq_enable(void) 


static inline int raw_irqs_disabled_flags(unsigned long flags)

{

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

	return !(flags & X86_EFLAGS_IF);

}



#endif

include/asm-x86_64/processor-flags.h

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

#define __ASM_X86_64_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_X86_64_PROCESSOR_FLAGS_H */

include/asm-x86_64/processor.h

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

#include <linux/personality.h>

#include <linux/cpumask.h>

#include <asm/processor-flags.h>



#define TF_MASK		0x00000100

#define IF_MASK		0x00000200
@@ -102,27 +103,6 @@ extern void print_cpu_info(struct cpuinfo_x86 *); 
extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c);

extern unsigned short num_cache_leaves;



/*

 * 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 */



/*

 * Intel CPU features in CR4

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE