Merge branch 'for-5.8/klp-module-fixups' into for-next

Jiri Kosina · Jiri Kosina · commit f644e7bbd7c1 · 2020-05-11T00:32:02.000+02:00
diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
@@ -745,7 +745,8 @@ static int klp_init_func(struct klp_object *obj, struct klp_func *func)
 			   func->old_sympos ? func->old_sympos : 1);
 }
 
-int klp_apply_object_relocs(struct klp_patch *patch, struct klp_object *obj)
+static int klp_apply_object_relocs(struct klp_patch *patch,
+				   struct klp_object *obj)
 {
 	int i, ret;
 	struct klp_modinfo *info = patch->mod->klp_info;

Original file line number	Diff line number	Diff line change
`@@ -745,7 +745,8 @@ static int klp_init_func(struct klp_object obj, struct klp_func func)`
`745`	`745`	`func->old_sympos ? func->old_sympos : 1);`
`746`	`746`	`}`
`747`	`747`
`748`		`-int klp_apply_object_relocs(struct klp_patch patch, struct klp_object obj)`
	`748`	`+static int klp_apply_object_relocs(struct klp_patch *patch,`
	`749`	`+ struct klp_object *obj)`
`749`	`750`	`{`
`750`	`751`	`int i, ret;`
`751`	`752`	`struct klp_modinfo *info = patch->mod->klp_info;`