[PATCH] kexec: consolidate crash late initialization
Vladimir Davydov
vdavydov at parallels.com
Wed May 30 06:05:09 EDT 2012
Use one module_init() instead of two.
---
kernel/kexec.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/kernel/kexec.c b/kernel/kexec.c
index 4e2e472..c3341cb 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -1240,7 +1240,6 @@ static int __init crash_notes_memory_init(void)
}
return 0;
}
-module_init(crash_notes_memory_init)
/*
@@ -1520,7 +1519,13 @@ static int __init crash_save_vmcoreinfo_init(void)
return 0;
}
-module_init(crash_save_vmcoreinfo_init)
+static int __init crash_init(void)
+{
+ crash_notes_memory_init();
+ crash_save_vmcoreinfo_init();
+ return 0;
+}
+module_init(crash_init)
/*
* Move into place and start executing a preloaded standalone
--
1.7.1
More information about the kexec
mailing list