git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
xen
/
xen-ops.h
diff --git
a/arch/x86/xen/xen-ops.h
b/arch/x86/xen/xen-ops.h
index b02a909bfd4c73a6468a2c8c159b7e0b32b75c5d..956a491ea998b1e5dddc0a90dde1b88ad5b25268 100644
(file)
--- a/
arch/x86/xen/xen-ops.h
+++ b/
arch/x86/xen/xen-ops.h
@@
-63,5
+63,5
@@
DECL_ASM(void, xen_irq_disable_direct, void);
DECL_ASM(unsigned long, xen_save_fl_direct, void);
DECL_ASM(void, xen_restore_fl_direct, unsigned long);
-void xen_iret
_direct
(void);
+void xen_iret(void);
#endif /* XEN_OPS_H */