diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 10:15:34 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 10:15:34 -0700 |
commit | 9497d7380b9c450830190c75aa43b25c278bb1f9 (patch) | |
tree | 019fe8a45676f873bf03746a671cc04bcc4512b0 /include | |
parent | d0bbe0dd353af9521e9d8bc5236308c677b6f62a (diff) | |
parent | 09675bd395458543e70d19544f8046038a2fd053 (diff) | |
download | linux-9497d7380b9c450830190c75aa43b25c278bb1f9.tar.gz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching
Pull livepatching updates from Jiri Kosina: "These are mostly smaller things that got accumulated during the development cycle. The unified solution is still being worked on and is not mature enough for 4.1 yet. - s390 livepatching support, from Jiri Slaby (has Ack from s390 maintainers) - error handling simplification, from Josh Poimboeuf - two minor code cleanups from Josh Poimboeuf and Miroslav Benes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching: livepatch: add support on s390 livepatch: remove unnecessary call to klp_find_object_module() livepatch: simplify disable error path livepatch: remove extern specifier from header files
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/livepatch.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/livepatch.h b/include/linux/livepatch.h index 95023fd8b00d..ee6dbb39a809 100644 --- a/include/linux/livepatch.h +++ b/include/linux/livepatch.h @@ -123,10 +123,10 @@ struct klp_patch { enum klp_state state; }; -extern int klp_register_patch(struct klp_patch *); -extern int klp_unregister_patch(struct klp_patch *); -extern int klp_enable_patch(struct klp_patch *); -extern int klp_disable_patch(struct klp_patch *); +int klp_register_patch(struct klp_patch *); +int klp_unregister_patch(struct klp_patch *); +int klp_enable_patch(struct klp_patch *); +int klp_disable_patch(struct klp_patch *); #endif /* CONFIG_LIVEPATCH */ |