diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-09-10 10:16:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-09-10 10:16:22 +0200 |
| commit | ce991095ccdf83ab4af7b4f5de0c8d3306fb97bf (patch) | |
| tree | 72b1188ce2cb024e66d92286011c45221bff666e /kernel/jump_label.c | |
| parent | jump_label: Use static_key_linked() accessor (diff) | |
| parent | jump_label: Fix typo in warning message (diff) | |
| download | linux-ce991095ccdf83ab4af7b4f5de0c8d3306fb97bf.tar.xz linux-ce991095ccdf83ab4af7b4f5de0c8d3306fb97bf.zip | |
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.c | 2 |
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; |