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

Commit c8558fcd authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[PATCH] lockdep: irqtrace cleanup of include/asm-i386/irqflags.h 



Clean up the x86 irqflags.h file:

 - macro => inline function transformation
 - simplifications
 - style fixes

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 55f327fa

include/asm-i386/irqflags.h

+83 −12
Original line number Diff line number Diff line
@@ -5,24 +5,95 @@ 
 *

 * This file gets included from lowlevel asm headers too, to provide

 * wrapped versions of the local_irq_*() APIs, based on the

 * raw_local_irq_*() macros from the lowlevel headers.

 * raw_local_irq_*() functions from the lowlevel headers.

 */

#ifndef _ASM_IRQFLAGS_H

#define _ASM_IRQFLAGS_H



#define raw_local_save_flags(x)	do { typecheck(unsigned long,x); __asm__ __volatile__("pushfl ; popl %0":"=g" (x): /* no input */); } while (0)

#define raw_local_irq_restore(x) do { typecheck(unsigned long,x); __asm__ __volatile__("pushl %0 ; popfl": /* no output */ :"g" (x):"memory", "cc"); } while (0)

#define raw_local_irq_disable()	__asm__ __volatile__("cli": : :"memory")

#define raw_local_irq_enable()	__asm__ __volatile__("sti": : :"memory")

/* used in the idle loop; sti takes one instruction cycle to complete */

#define raw_safe_halt()		__asm__ __volatile__("sti; hlt": : :"memory")

/* used when interrupts are already enabled or to shutdown the processor */

#define halt()			__asm__ __volatile__("hlt": : :"memory")

#ifndef __ASSEMBLY__



#define raw_irqs_disabled_flags(flags)	(!((flags) & (1<<9)))

static inline unsigned long __raw_local_save_flags(void)

{

	unsigned long flags;



/* For spinlocks etc */

#define raw_local_irq_save(x)	__asm__ __volatile__("pushfl ; popl %0 ; cli":"=g" (x): /* no input */ :"memory")

	__asm__ __volatile__(

		"pushfl ; popl %0"

		: "=g" (flags)

		: /* no input */

	);



	return flags;

}



#define raw_local_save_flags(flags) \

		do { (flags) = __raw_local_save_flags(); } while (0)



static inline void raw_local_irq_restore(unsigned long flags)

{

	__asm__ __volatile__(

		"pushl %0 ; popfl"

		: /* no output */

		:"g" (flags)

		:"memory", "cc"

	);

}



static inline void raw_local_irq_disable(void)

{

	__asm__ __volatile__("cli" : : : "memory");

}



static inline void raw_local_irq_enable(void)

{

	__asm__ __volatile__("sti" : : : "memory");

}



/*

 * Used in the idle loop; sti takes one instruction cycle

 * to complete:

 */

static inline void raw_safe_halt(void)

{

	__asm__ __volatile__("sti; hlt" : : : "memory");

}



/*

 * Used when interrupts are already enabled or to

 * shutdown the processor:

 */

static inline void halt(void)

{

	__asm__ __volatile__("hlt": : :"memory");

}



static inline int raw_irqs_disabled_flags(unsigned long flags)

{

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

}



static inline int raw_irqs_disabled(void)

{

	unsigned long flags = __raw_local_save_flags();



	return raw_irqs_disabled_flags(flags);

}



/*

 * For spinlocks, etc:

 */

static inline unsigned long __raw_local_irq_save(void)

{

	unsigned long flags = __raw_local_save_flags();



	raw_local_irq_disable();



	return flags;

}



#define raw_local_irq_save(flags) \

		do { (flags) = __raw_local_irq_save(); } while (0)



#endif /* __ASSEMBLY__ */



/*

 * Do the CPU's IRQ-state tracing from assembly code. We call a