aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2018-08-20 12:33:50 -0400
committerJiri Kosina <jkosina@suse.cz>2018-08-20 12:33:50 -0400
commitbadf58a272132c7bb953666b65ef816c1ef9efff (patch)
tree577b22753144c1484617fdbbc7fce89685f0078c
parent6e9df95b76cad18f7b217bdad7bb8a26d63b8c47 (diff)
parent1d98a69e5cef3aeb68bcefab0e67e342d6bb4dad (diff)
Merge branch 'for-4.19/upstream' into for-linus
-rw-r--r--kernel/livepatch/transition.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/kernel/livepatch/transition.c b/kernel/livepatch/transition.c
index 7c6631e693bc..5bc349805e03 100644
--- a/kernel/livepatch/transition.c
+++ b/kernel/livepatch/transition.c
@@ -310,13 +310,6 @@ static bool klp_try_switch_task(struct task_struct *task)
310 return true; 310 return true;
311 311
312 /* 312 /*
313 * For arches which don't have reliable stack traces, we have to rely
314 * on other methods (e.g., switching tasks at kernel exit).
315 */
316 if (!klp_have_reliable_stack())
317 return false;
318
319 /*
320 * Now try to check the stack for any to-be-patched or to-be-unpatched 313 * Now try to check the stack for any to-be-patched or to-be-unpatched
321 * functions. If all goes well, switch the task to the target patch 314 * functions. If all goes well, switch the task to the target patch
322 * state. 315 * state.