Now, that LUO and KHO both live under kernel/liveupdate, it makes sense to also move the kho debugfs files to liveupdate/ The old names: /sys/kernel/debug/kho/out/ /sys/kernel/debug/kho/in/ The new names: /sys/kernel/debug/liveupdate/kho_out/ /sys/kernel/debug/liveupdate/kho_in/ Also, export the liveupdate_debufs_root, so LUO selftests could use it as well. Signed-off-by: Pasha Tatashin --- kernel/liveupdate/kexec_handover_debug.c | 11 ++++++----- kernel/liveupdate/luo_internal.h | 4 ++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/kernel/liveupdate/kexec_handover_debug.c b/kernel/liveupdate/kexec_handover_debug.c index af4bad225630..f06d6cdfeab3 100644 --- a/kernel/liveupdate/kexec_handover_debug.c +++ b/kernel/liveupdate/kexec_handover_debug.c @@ -14,8 +14,9 @@ #include #include #include "kexec_handover_internal.h" +#include "luo_internal.h" -static struct dentry *debugfs_root; +struct dentry *liveupdate_debugfs_root; struct fdt_debugfs { struct list_head list; @@ -120,7 +121,7 @@ __init void kho_in_debugfs_init(struct kho_debugfs *dbg, const void *fdt) INIT_LIST_HEAD(&dbg->fdt_list); - dir = debugfs_create_dir("in", debugfs_root); + dir = debugfs_create_dir("in", liveupdate_debugfs_root); if (IS_ERR(dir)) { err = PTR_ERR(dir); goto err_out; @@ -180,7 +181,7 @@ __init int kho_out_debugfs_init(struct kho_debugfs *dbg) INIT_LIST_HEAD(&dbg->fdt_list); - dir = debugfs_create_dir("out", debugfs_root); + dir = debugfs_create_dir("out", liveupdate_debugfs_root); if (IS_ERR(dir)) return -ENOMEM; @@ -214,8 +215,8 @@ __init int kho_out_debugfs_init(struct kho_debugfs *dbg) __init int kho_debugfs_init(void) { - debugfs_root = debugfs_create_dir("kho", NULL); - if (IS_ERR(debugfs_root)) + liveupdate_debugfs_root = debugfs_create_dir("liveupdate", NULL); + if (IS_ERR(liveupdate_debugfs_root)) return -ENOENT; return 0; } diff --git a/kernel/liveupdate/luo_internal.h b/kernel/liveupdate/luo_internal.h index 9091ed04c606..78bea012c383 100644 --- a/kernel/liveupdate/luo_internal.h +++ b/kernel/liveupdate/luo_internal.h @@ -53,4 +53,8 @@ void luo_sysfs_notify(void); static inline void luo_sysfs_notify(void) {} #endif +#ifdef CONFIG_KEXEC_HANDOVER_DEBUG +extern struct dentry *liveupdate_debugfs_root; +#endif + #endif /* _LINUX_LUO_INTERNAL_H */ -- 2.50.1.565.gc32cd1483b-goog