diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-04-13 17:57:20 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-04-13 17:57:20 -0400 |
| commit | bcf5d545890e9f7414341c572337ce58cba00a32 (patch) | |
| tree | 962e6d5c744b0029534535efb6d3fcf6a8906a1f /include/linux/livepatch.h | |
| parent | 8cb2c2dc472775479a1a7e78180955f6f1cb0b0a (diff) | |
| parent | 2e3ac940f2754d7dc616aba1643a668954fe892f (diff) | |
Merge branch 'for-4.1/core-noarch' into for-linus
Diffstat (limited to 'include/linux/livepatch.h')
| -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 { | |||
| 123 | enum klp_state state; | 123 | enum klp_state state; |
| 124 | }; | 124 | }; |
| 125 | 125 | ||
| 126 | extern int klp_register_patch(struct klp_patch *); | 126 | int klp_register_patch(struct klp_patch *); |
| 127 | extern int klp_unregister_patch(struct klp_patch *); | 127 | int klp_unregister_patch(struct klp_patch *); |
| 128 | extern int klp_enable_patch(struct klp_patch *); | 128 | int klp_enable_patch(struct klp_patch *); |
| 129 | extern int klp_disable_patch(struct klp_patch *); | 129 | int klp_disable_patch(struct klp_patch *); |
| 130 | 130 | ||
| 131 | #endif /* CONFIG_LIVEPATCH */ | 131 | #endif /* CONFIG_LIVEPATCH */ |
| 132 | 132 | ||