diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-04-13 23:57:20 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-04-13 23:57:20 +0200 |
| commit | bcf5d545890e9f7414341c572337ce58cba00a32 (patch) | |
| tree | 962e6d5c744b0029534535efb6d3fcf6a8906a1f /arch/x86/include/asm/livepatch.h | |
| parent | 8cb2c2dc472775479a1a7e78180955f6f1cb0b0a (diff) | |
| parent | 2e3ac940f2754d7dc616aba1643a668954fe892f (diff) | |
Merge branch 'for-4.1/core-noarch' into for-linus
Diffstat (limited to 'arch/x86/include/asm/livepatch.h')
| -rw-r--r-- | arch/x86/include/asm/livepatch.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/livepatch.h b/arch/x86/include/asm/livepatch.h index a455a53d789a..2d29197bd2fb 100644 --- a/arch/x86/include/asm/livepatch.h +++ b/arch/x86/include/asm/livepatch.h @@ -32,8 +32,8 @@ static inline int klp_check_compiler_support(void) #endif return 0; } -extern int klp_write_module_reloc(struct module *mod, unsigned long type, - unsigned long loc, unsigned long value); +int klp_write_module_reloc(struct module *mod, unsigned long type, + unsigned long loc, unsigned long value); static inline void klp_arch_set_pc(struct pt_regs *regs, unsigned long ip) { |