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

Commit d650a514 authored by Brian Gerst's avatar Brian Gerst Committed by Tejun Heo
Browse files

x86: merge irq_regs.h 



Impact: cleanup, better irq_regs code generation for x86_64

Make 64-bit use the same optimizations as 32-bit.

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 6826c8ff

arch/x86/include/asm/irq_regs.h

+31 −5
Original line number Diff line number Diff line 
#ifdef CONFIG_X86_32

# include "irq_regs_32.h"

#else

# include "irq_regs_64.h"

#endif
 
/*

 * Per-cpu current frame pointer - the location of the last exception frame on

 * the stack, stored in the per-cpu area.

 *

 * Jeremy Fitzhardinge <jeremy@goop.org>

 */

#ifndef _ASM_X86_IRQ_REGS_H

#define _ASM_X86_IRQ_REGS_H



#include <asm/percpu.h>



#define ARCH_HAS_OWN_IRQ_REGS



DECLARE_PER_CPU(struct pt_regs *, irq_regs);



static inline struct pt_regs *get_irq_regs(void)

{

	return percpu_read(irq_regs);

}



static inline struct pt_regs *set_irq_regs(struct pt_regs *new_regs)

{

	struct pt_regs *old_regs;



	old_regs = get_irq_regs();

	percpu_write(irq_regs, new_regs);



	return old_regs;

}



#endif /* _ASM_X86_IRQ_REGS_32_H */

arch/x86/include/asm/irq_regs_32.h

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
/*

 * Per-cpu current frame pointer - the location of the last exception frame on

 * the stack, stored in the per-cpu area.

 *

 * Jeremy Fitzhardinge <jeremy@goop.org>

 */

#ifndef _ASM_X86_IRQ_REGS_32_H

#define _ASM_X86_IRQ_REGS_32_H



#include <asm/percpu.h>



#define ARCH_HAS_OWN_IRQ_REGS



DECLARE_PER_CPU(struct pt_regs *, irq_regs);



static inline struct pt_regs *get_irq_regs(void)

{

	return percpu_read(irq_regs);

}



static inline struct pt_regs *set_irq_regs(struct pt_regs *new_regs)

{

	struct pt_regs *old_regs;



	old_regs = get_irq_regs();

	percpu_write(irq_regs, new_regs);



	return old_regs;

}



#endif /* _ASM_X86_IRQ_REGS_32_H */

arch/x86/include/asm/irq_regs_64.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <asm-generic/irq_regs.h>

arch/x86/kernel/irq_64.c

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 
DEFINE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat);

EXPORT_PER_CPU_SYMBOL(irq_stat);



DEFINE_PER_CPU(struct pt_regs *, irq_regs);

EXPORT_PER_CPU_SYMBOL(irq_regs);



/*

 * Probabilistic stack overflow check:

 *