RepoMirrors
/
kpatch
mirror of https://github.com/dynup/kpatch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kmod/core: use pr_err instead of printk

This commit is contained in:
Josh Poimboeuf 2014-04-15 14:11:50 -05:00
parent 2fd20a7a30
commit e6cad4f0b1
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kmod/core/core.c
View File

@ -72,9 +72,8 @@ void kpatch_backtrace_address_verify(void *data, unsigned long address,
if (address >= func->old_addr &&
address < func->old_addr + func->old_size) {
printk("kpatch: activeness safety check failed for "
"function at address " "'%lx()'\n",
func->old_addr);
pr_err("activeness safety check failed for function "
"at address 0x%lx\n", func->old_addr);
args->ret = -EBUSY;
return;
}
@ -234,9 +233,8 @@ int kpatch_register(struct module *mod, struct kpatch_func *funcs,
ret = ftrace_set_filter_ip(&kpatch_ftrace_ops, func->old_addr,
0, 0);
if (ret) {
printk("kpatch: can't set ftrace filter at address "
"0x%lx (%d)\n",
func->old_addr, ret);
pr_err("can't set ftrace filter at address 0x%lx\n",
func->old_addr);
goto out;
}
}
@ -245,7 +243,7 @@ int kpatch_register(struct module *mod, struct kpatch_func *funcs,
if (!kpatch_num_registered++) {
ret = register_ftrace_function(&kpatch_ftrace_ops);
if (ret) {
printk("kpatch: can't register ftrace function \n");
pr_err("can't register ftrace handler\n");
goto out;
}
}
@ -259,8 +257,7 @@ int kpatch_register(struct module *mod, struct kpatch_func *funcs,
if (!--kpatch_num_registered) {
ret2 = unregister_ftrace_function(&kpatch_ftrace_ops);
if (ret2)
printk("kpatch: unregister failed (%d)\n",
ret2);
pr_err("ftrace unregister failed (%d)\n", ret2);
}
goto out;
@ -295,7 +292,7 @@ int kpatch_unregister(struct module *mod, struct kpatch_func *funcs,
if (!--kpatch_num_registered) {
ret = unregister_ftrace_function(&kpatch_ftrace_ops);
if (ret) {
printk("kpatch: can't unregister ftrace function\n");
pr_err("can't unregister ftrace handler\n");
goto out;
}
}
@ -322,9 +319,8 @@ int kpatch_unregister(struct module *mod, struct kpatch_func *funcs,
ret = ftrace_set_filter_ip(&kpatch_ftrace_ops, func->old_addr,
1, 0);
if (ret) {
printk("kpatch: can't remove ftrace filter at address "
"0x%lx (%d)\n",
func->old_addr, ret);
pr_err("can't remove ftrace filter at address 0x%lx\n",
func->old_addr);
goto out;
}
}