diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2016-10-30 16:37:31 -0400 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2016-10-31 17:55:42 +0100 |
| commit | 8ba8b05f579dfc84c446033348d0ba84b893e64f (patch) | |
| tree | 4a822303134c425b3aae40f0bc3cb0e892fc2efd | |
| parent | cee672e1803e5b96c9b66285407e78d9bf8fa7f9 (diff) | |
| download | linux-stable-8ba8b05f579dfc84c446033348d0ba84b893e64f.tar.gz linux-stable-8ba8b05f579dfc84c446033348d0ba84b893e64f.tar.bz2 linux-stable-8ba8b05f579dfc84c446033348d0ba84b893e64f.zip | |
s390: kernel: make lgr explicitly non-modular
The Makefile currently controlling compilation of this code is obj-y
meaning that it currently is not being built as a module by anyone.
Lets remove the couple traces of modular infrastructure use, so that
when reading the driver there is no doubt it is builtin-only.
Since module_init translates to device_initcall in the non-modular
case, the init ordering remains unchanged with this commit.
We replace module.h with init.h and export.h since the file does
export some symbols.
Cc: linux-s390@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| -rw-r--r-- | arch/s390/kernel/lgr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/s390/kernel/lgr.c b/arch/s390/kernel/lgr.c index 6ea6d69339b5..ae7dff110054 100644 --- a/arch/s390/kernel/lgr.c +++ b/arch/s390/kernel/lgr.c @@ -5,7 +5,8 @@ * Author(s): Michael Holzheu <holzheu@linux.vnet.ibm.com> */ -#include <linux/module.h> +#include <linux/init.h> +#include <linux/export.h> #include <linux/timer.h> #include <linux/slab.h> #include <asm/facility.h> @@ -183,4 +184,4 @@ static int __init lgr_init(void) lgr_timer_set(); return 0; } -module_init(lgr_init); +device_initcall(lgr_init); |