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

Pull livepatching updates from Jiri Kosina:

 - livepatching kselftests improvements from Joe Lawrence and Miroslav
   Benes

 - making use of gcc's -flive-patching option when available, from
   Miroslav Benes

 - kobject handling cleanups, from Petr Mladek

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching:
  livepatch: Remove duplicated code for early initialization
  livepatch: Remove custom kobject state handling
  livepatch: Convert error about unsupported reliable stacktrace into a warning
  selftests/livepatch: Add functions.sh to TEST_PROGS_EXTENDED
  kbuild: use -flive-patching when CONFIG_LIVEPATCH is enabled
  selftests/livepatch: use TEST_PROGS for test scripts

1 files changed, 0 insertions, 3 deletions

diff --git a/include/linux/livepatch.h b/include/linux/livepatch.h
index 53551f470722..a14bab1a0a3e 100644
--- a/include/linux/livepatch.h
+++ b/include/linux/livepatch.h
@@ -86,7 +86,6 @@ struct klp_func {
         struct list_head node;
         struct list_head stack_node;
         unsigned long old_size, new_size;
-        bool kobj_added;
         bool nop;
         bool patched;
         bool transition;
@@ -141,7 +140,6 @@ struct klp_object {
         struct list_head func_list;
         struct list_head node;
         struct module *mod;
-        bool kobj_added;
         bool dynamic;
         bool patched;
 };
@@ -170,7 +168,6 @@ struct klp_patch {
         struct list_head list;
         struct kobject kobj;
         struct list_head obj_list;
-        bool kobj_added;
         bool enabled;
         bool forced;
         struct work_struct free_work;