Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching

Pull livepatching updates from Jiri Kosina:

 - handle 'infinitely'-long sleeping tasks, from Miroslav Benes

 - remove 'immediate' feature, as it turns out it doesn't provide the
   originally expected semantics, and brings more issues than value

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
  livepatch: add locking to force and signal functions
  livepatch: Remove immediate feature
  livepatch: force transition to finish
  livepatch: send a fake signal to all blocking tasks

4 files changed, 0 insertions, 60 deletions

diff --git a/samples/livepatch/livepatch-callbacks-demo.c b/samples/livepatch/livepatch-callbacks-demo.c
index 3d115bd68442..72f9e6d1387b 100644
--- a/samples/livepatch/livepatch-callbacks-demo.c
+++ b/samples/livepatch/livepatch-callbacks-demo.c
@@ -197,21 +197,6 @@ static int livepatch_callbacks_demo_init(void)
 {
         int ret;
 
-        if (!klp_have_reliable_stack() && !patch.immediate) {
-                /*
-                 * WARNING: Be very careful when using 'patch.immediate' in
-                 * your patches.  It's ok to use it for simple patches like
-                 * this, but for more complex patches which change function
-                 * semantics, locking semantics, or data structures, it may not
-                 * be safe.  Use of this option will also prevent removal of
-                 * the patch.
-                 *
-                 * See Documentation/livepatch/livepatch.txt for more details.
-                 */
-                patch.immediate = true;
-                pr_notice("The consistency model isn't supported for your architecture.  Bypassing safety mechanisms and applying the patch immediately.\n");
-        }
-
         ret = klp_register_patch(&patch);
         if (ret)
                 return ret;
diff --git a/samples/livepatch/livepatch-sample.c b/samples/livepatch/livepatch-sample.c
index 84795223f15f..2d554dd930e2 100644
--- a/samples/livepatch/livepatch-sample.c
+++ b/samples/livepatch/livepatch-sample.c
@@ -71,21 +71,6 @@ static int livepatch_init(void)
 {
         int ret;
 
-        if (!klp_have_reliable_stack() && !patch.immediate) {
-                /*
-                 * WARNING: Be very careful when using 'patch.immediate' in
-                 * your patches.  It's ok to use it for simple patches like
-                 * this, but for more complex patches which change function
-                 * semantics, locking semantics, or data structures, it may not
-                 * be safe.  Use of this option will also prevent removal of
-                 * the patch.
-                 *
-                 * See Documentation/livepatch/livepatch.txt for more details.
-                 */
-                patch.immediate = true;
-                pr_notice("The consistency model isn't supported for your architecture.  Bypassing safety mechanisms and applying the patch immediately.\n");
-        }
-
         ret = klp_register_patch(&patch);
         if (ret)
                 return ret;
diff --git a/samples/livepatch/livepatch-shadow-fix1.c b/samples/livepatch/livepatch-shadow-fix1.c
index fbe0a1f3d99b..830c55514f9f 100644
--- a/samples/livepatch/livepatch-shadow-fix1.c
+++ b/samples/livepatch/livepatch-shadow-fix1.c
@@ -133,21 +133,6 @@ static int livepatch_shadow_fix1_init(void)
 {
         int ret;
 
-        if (!klp_have_reliable_stack() && !patch.immediate) {
-                /*
-                 * WARNING: Be very careful when using 'patch.immediate' in
-                 * your patches.  It's ok to use it for simple patches like
-                 * this, but for more complex patches which change function
-                 * semantics, locking semantics, or data structures, it may not
-                 * be safe.  Use of this option will also prevent removal of
-                 * the patch.
-                 *
-                 * See Documentation/livepatch/livepatch.txt for more details.
-                 */
-                patch.immediate = true;
-                pr_notice("The consistency model isn't supported for your architecture.  Bypassing safety mechanisms and applying the patch immediately.\n");
-        }
-
         ret = klp_register_patch(&patch);
         if (ret)
                 return ret;
diff --git a/samples/livepatch/livepatch-shadow-fix2.c b/samples/livepatch/livepatch-shadow-fix2.c
index 53c1794bdc5f..ff9948f0ec00 100644
--- a/samples/livepatch/livepatch-shadow-fix2.c
+++ b/samples/livepatch/livepatch-shadow-fix2.c
@@ -128,21 +128,6 @@ static int livepatch_shadow_fix2_init(void)
 {
         int ret;
 
-        if (!klp_have_reliable_stack() && !patch.immediate) {
-                /*
-                 * WARNING: Be very careful when using 'patch.immediate' in
-                 * your patches.  It's ok to use it for simple patches like
-                 * this, but for more complex patches which change function
-                 * semantics, locking semantics, or data structures, it may not
-                 * be safe.  Use of this option will also prevent removal of
-                 * the patch.
-                 *
-                 * See Documentation/livepatch/livepatch.txt for more details.
-                 */
-                patch.immediate = true;
-                pr_notice("The consistency model isn't supported for your architecture.  Bypassing safety mechanisms and applying the patch immediately.\n");
-        }
-
         ret = klp_register_patch(&patch);
         if (ret)
                 return ret;