diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-09-30 16:44:04 +0200 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-09-30 16:44:04 +0200 |
| commit | 6c8ff877cdf13cd5287ed9d700cfb6cb70e2bfa1 (patch) | |
| tree | 2ab49b7d19fb69cdae5b6be9e7ba44f6cf3d45ef /arch/x86/include/asm/irqflags.h | |
| parent | Merge tag 'keys-next-20140922' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | Linux 3.16 (diff) | |
| download | linux-6c8ff877cdf13cd5287ed9d700cfb6cb70e2bfa1.tar.xz linux-6c8ff877cdf13cd5287ed9d700cfb6cb70e2bfa1.zip | |
Merge commit 'v3.16' into next
Diffstat (limited to 'arch/x86/include/asm/irqflags.h')
| -rw-r--r-- | arch/x86/include/asm/irqflags.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h index bba3cf88e624..0a8b519226b8 100644 --- a/arch/x86/include/asm/irqflags.h +++ b/arch/x86/include/asm/irqflags.h @@ -129,7 +129,7 @@ static inline notrace unsigned long arch_local_irq_save(void) #define PARAVIRT_ADJUST_EXCEPTION_FRAME /* */ -#define INTERRUPT_RETURN iretq +#define INTERRUPT_RETURN jmp native_iret #define USERGS_SYSRET64 \ swapgs; \ sysretq; |