mirror of
https://github.com/torvalds/linux.git
synced 2024-10-31 17:21:49 +00:00
x86: change irq functions to accomodate 64-bit
This patch changes the irq handling function definitions in paravirt.h (like raw_local_irq_disable) to accomodate for x86_64. The differences are in the calling convention. Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
6057fc827b
commit
2e47d3e6c3
@ -1085,52 +1085,68 @@ struct paravirt_patch_site {
|
|||||||
extern struct paravirt_patch_site __parainstructions[],
|
extern struct paravirt_patch_site __parainstructions[],
|
||||||
__parainstructions_end[];
|
__parainstructions_end[];
|
||||||
|
|
||||||
|
#ifdef CONFIG_X86_32
|
||||||
|
#define PV_SAVE_REGS "pushl %%ecx; pushl %%edx;"
|
||||||
|
#define PV_RESTORE_REGS "popl %%edx; popl %%ecx"
|
||||||
|
#define PV_FLAGS_ARG "0"
|
||||||
|
#define PV_EXTRA_CLOBBERS
|
||||||
|
#define PV_VEXTRA_CLOBBERS
|
||||||
|
#else
|
||||||
|
/* We save some registers, but all of them, that's too much. We clobber all
|
||||||
|
* caller saved registers but the argument parameter */
|
||||||
|
#define PV_SAVE_REGS "pushq %%rdi;"
|
||||||
|
#define PV_RESTORE_REGS "popq %%rdi;"
|
||||||
|
#define PV_EXTRA_CLOBBERS EXTRA_CLOBBERS, "rcx" , "rdx"
|
||||||
|
#define PV_VEXTRA_CLOBBERS EXTRA_CLOBBERS, "rdi", "rcx" , "rdx"
|
||||||
|
#define PV_FLAGS_ARG "D"
|
||||||
|
#endif
|
||||||
|
|
||||||
static inline unsigned long __raw_local_save_flags(void)
|
static inline unsigned long __raw_local_save_flags(void)
|
||||||
{
|
{
|
||||||
unsigned long f;
|
unsigned long f;
|
||||||
|
|
||||||
asm volatile(paravirt_alt("pushl %%ecx; pushl %%edx;"
|
asm volatile(paravirt_alt(PV_SAVE_REGS
|
||||||
PARAVIRT_CALL
|
PARAVIRT_CALL
|
||||||
"popl %%edx; popl %%ecx")
|
PV_RESTORE_REGS)
|
||||||
: "=a"(f)
|
: "=a"(f)
|
||||||
: paravirt_type(pv_irq_ops.save_fl),
|
: paravirt_type(pv_irq_ops.save_fl),
|
||||||
paravirt_clobber(CLBR_EAX)
|
paravirt_clobber(CLBR_EAX)
|
||||||
: "memory", "cc");
|
: "memory", "cc" PV_VEXTRA_CLOBBERS);
|
||||||
return f;
|
return f;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void raw_local_irq_restore(unsigned long f)
|
static inline void raw_local_irq_restore(unsigned long f)
|
||||||
{
|
{
|
||||||
asm volatile(paravirt_alt("pushl %%ecx; pushl %%edx;"
|
asm volatile(paravirt_alt(PV_SAVE_REGS
|
||||||
PARAVIRT_CALL
|
PARAVIRT_CALL
|
||||||
"popl %%edx; popl %%ecx")
|
PV_RESTORE_REGS)
|
||||||
: "=a"(f)
|
: "=a"(f)
|
||||||
: "0"(f),
|
: PV_FLAGS_ARG(f),
|
||||||
paravirt_type(pv_irq_ops.restore_fl),
|
paravirt_type(pv_irq_ops.restore_fl),
|
||||||
paravirt_clobber(CLBR_EAX)
|
paravirt_clobber(CLBR_EAX)
|
||||||
: "memory", "cc");
|
: "memory", "cc" PV_EXTRA_CLOBBERS);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void raw_local_irq_disable(void)
|
static inline void raw_local_irq_disable(void)
|
||||||
{
|
{
|
||||||
asm volatile(paravirt_alt("pushl %%ecx; pushl %%edx;"
|
asm volatile(paravirt_alt(PV_SAVE_REGS
|
||||||
PARAVIRT_CALL
|
PARAVIRT_CALL
|
||||||
"popl %%edx; popl %%ecx")
|
PV_RESTORE_REGS)
|
||||||
:
|
:
|
||||||
: paravirt_type(pv_irq_ops.irq_disable),
|
: paravirt_type(pv_irq_ops.irq_disable),
|
||||||
paravirt_clobber(CLBR_EAX)
|
paravirt_clobber(CLBR_EAX)
|
||||||
: "memory", "eax", "cc");
|
: "memory", "eax", "cc" PV_EXTRA_CLOBBERS);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void raw_local_irq_enable(void)
|
static inline void raw_local_irq_enable(void)
|
||||||
{
|
{
|
||||||
asm volatile(paravirt_alt("pushl %%ecx; pushl %%edx;"
|
asm volatile(paravirt_alt(PV_SAVE_REGS
|
||||||
PARAVIRT_CALL
|
PARAVIRT_CALL
|
||||||
"popl %%edx; popl %%ecx")
|
PV_RESTORE_REGS)
|
||||||
:
|
:
|
||||||
: paravirt_type(pv_irq_ops.irq_enable),
|
: paravirt_type(pv_irq_ops.irq_enable),
|
||||||
paravirt_clobber(CLBR_EAX)
|
paravirt_clobber(CLBR_EAX)
|
||||||
: "memory", "eax", "cc");
|
: "memory", "eax", "cc" PV_EXTRA_CLOBBERS);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline unsigned long __raw_local_irq_save(void)
|
static inline unsigned long __raw_local_irq_save(void)
|
||||||
@ -1205,6 +1221,7 @@ static inline unsigned long __raw_local_irq_save(void)
|
|||||||
CLBR_NONE, \
|
CLBR_NONE, \
|
||||||
jmp *%cs:pv_cpu_ops+PV_CPU_irq_enable_syscall_ret)
|
jmp *%cs:pv_cpu_ops+PV_CPU_irq_enable_syscall_ret)
|
||||||
|
|
||||||
|
|
||||||
#ifdef CONFIG_X86_32
|
#ifdef CONFIG_X86_32
|
||||||
#define GET_CR0_INTO_EAX \
|
#define GET_CR0_INTO_EAX \
|
||||||
push %ecx; push %edx; \
|
push %ecx; push %edx; \
|
||||||
|
Loading…
Reference in New Issue
Block a user