summaryrefslogtreecommitdiffstats
path: root/kernel/jump_label.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2018-09-10 10:16:22 +0200
committerIngo Molnar <mingo@kernel.org>2018-09-10 10:16:22 +0200
commitce991095ccdf83ab4af7b4f5de0c8d3306fb97bf (patch)
tree72b1188ce2cb024e66d92286011c45221bff666e /kernel/jump_label.c
parent34e12b864e617ca7e4f6a3108460aa143bf20056 (diff)
parentda260fe12330be8b003c2ab07a112704163ea675 (diff)
downloadlinux-ce991095ccdf83ab4af7b4f5de0c8d3306fb97bf.tar.bz2
Merge branch 'locking/urgent' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/jump_label.c')
-rw-r--r--kernel/jump_label.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/jump_label.c b/kernel/jump_label.c
index 61d1c0178731..de97d8753b62 100644
--- a/kernel/jump_label.c
+++ b/kernel/jump_label.c
@@ -678,7 +678,7 @@ jump_label_module_notify(struct notifier_block *self, unsigned long val,
case MODULE_STATE_COMING:
ret = jump_label_add_module(mod);
if (ret) {
- WARN(1, "Failed to allocatote memory: jump_label may not work properly.\n");
+ WARN(1, "Failed to allocate memory: jump_label may not work properly.\n");
jump_label_del_module(mod);
}
break;