projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'regulator/topic/da9211', 'regulator/topic/getreg...
[cascardo/linux.git]
/
arch
/
x86
/
include
/
asm
/
irqflags.h
diff --git
a/arch/x86/include/asm/irqflags.h
b/arch/x86/include/asm/irqflags.h
index
bba3cf8
..
0a8b519
100644
(file)
--- 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;