aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2013-08-21 16:07:42 -0400
committerIngo Molnar <mingo@kernel.org>2013-08-22 03:17:19 -0400
commiteb86b5fd505cb97743d84226140cf247d91a2f03 (patch)
tree14765ad223149b66f9823bb81fc623e271d16018
parent28596b6a8779b736829ad837f95fdc2e81bdd1ee (diff)
x86/asmlinkage: Fix warning in xen asmlinkage change
Current code uses asmlinkage for functions without arguments. This adds an implicit regparm(0) which creates a warning when assigning the function to pointers. Use __visible for the functions without arguments. This avoids having to add regparm(0) to function pointers. Since they have no arguments it does not make any difference. Signed-off-by: Andi Kleen <ak@linux.intel.com> Link: http://lkml.kernel.org/r/1377115662-4865-1-git-send-email-andi@firstfloor.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/xen/xen-ops.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
index d380213cda25..95f8c6142328 100644
--- a/arch/x86/xen/xen-ops.h
+++ b/arch/x86/xen/xen-ops.h
@@ -105,7 +105,7 @@ static inline void __init xen_init_apic(void)
105/* Declare an asm function, along with symbols needed to make it 105/* Declare an asm function, along with symbols needed to make it
106 inlineable */ 106 inlineable */
107#define DECL_ASM(ret, name, ...) \ 107#define DECL_ASM(ret, name, ...) \
108 asmlinkage ret name(__VA_ARGS__); \ 108 __visible ret name(__VA_ARGS__); \
109 extern char name##_end[] __visible; \ 109 extern char name##_end[] __visible; \
110 extern char name##_reloc[] __visible 110 extern char name##_reloc[] __visible
111 111
@@ -115,11 +115,11 @@ DECL_ASM(unsigned long, xen_save_fl_direct, void);
115DECL_ASM(void, xen_restore_fl_direct, unsigned long); 115DECL_ASM(void, xen_restore_fl_direct, unsigned long);
116 116
117/* These are not functions, and cannot be called normally */ 117/* These are not functions, and cannot be called normally */
118asmlinkage void xen_iret(void); 118__visible void xen_iret(void);
119asmlinkage void xen_sysexit(void); 119__visible void xen_sysexit(void);
120asmlinkage void xen_sysret32(void); 120__visible void xen_sysret32(void);
121asmlinkage void xen_sysret64(void); 121__visible void xen_sysret64(void);
122asmlinkage void xen_adjust_exception_frame(void); 122__visible void xen_adjust_exception_frame(void);
123 123
124extern int xen_panic_handler_init(void); 124extern int xen_panic_handler_init(void);
125 125