summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-03-26 16:44:26 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-03-26 16:44:26 +0100
commit6f3a283c2f6bbbb5a9a6801a0befa61cb60195f1 (patch)
treee4998d6f696b383e3e4d3709ec351f16b83f79f0
parent5244f5e2d801259af877ee759e8c22364c607072 (diff)
parentfb9d62b27ab1e07d625591549c314b7d406d21df (diff)
downloadlwn-6f3a283c2f6bbbb5a9a6801a0befa61cb60195f1.tar.gz
lwn-6f3a283c2f6bbbb5a9a6801a0befa61cb60195f1.zip
Merge branch 'pm-em'
* pm-em: PM: EM: postpone creating the debugfs dir till fs_initcall
-rw-r--r--kernel/power/energy_model.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/energy_model.c b/kernel/power/energy_model.c
index 1358fa4abfa8..0f4530b3a8cd 100644
--- a/kernel/power/energy_model.c
+++ b/kernel/power/energy_model.c
@@ -98,7 +98,7 @@ static int __init em_debug_init(void)
return 0;
}
-core_initcall(em_debug_init);
+fs_initcall(em_debug_init);
#else /* CONFIG_DEBUG_FS */
static void em_debug_create_pd(struct device *dev) {}
static void em_debug_remove_pd(struct device *dev) {}