diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2017-05-02 12:38:57 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-05-03 09:08:57 +0200 |
| commit | 085b6ba0f7971d18fc3078b25e8309e9e75659cb (patch) | |
| tree | d45ad05a8ea5ad713b11e11fc7aba77596bd948e /arch/s390 | |
| parent | 07a63cbe8bcb6ba72fb989dcab1ec55ec6c36c7e (diff) | |
| download | linux-085b6ba0f7971d18fc3078b25e8309e9e75659cb.tar.gz linux-085b6ba0f7971d18fc3078b25e8309e9e75659cb.tar.bz2 linux-085b6ba0f7971d18fc3078b25e8309e9e75659cb.zip | |
s390/ftrace: fix compile for !MODULES
Fix this compile error if CONFIG_MODULES is disabled:
arch/s390/built-in.o: In function `ftrace_plt_init':
arch/s390/kernel/ftrace.o:(.init.text+0x34cc): undefined reference to `module_alloc'
Reported-by: Rob Landley <rob@landley.net>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/ftrace.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c index 60a8a4e207ed..68f2b8a15eab 100644 --- a/arch/s390/kernel/ftrace.c +++ b/arch/s390/kernel/ftrace.c @@ -172,6 +172,8 @@ int __init ftrace_dyn_arch_init(void) return 0; } +#ifdef CONFIG_MODULES + static int __init ftrace_plt_init(void) { unsigned int *ip; @@ -190,6 +192,8 @@ static int __init ftrace_plt_init(void) } device_initcall(ftrace_plt_init); +#endif /* CONFIG_MODULES */ + #ifdef CONFIG_FUNCTION_GRAPH_TRACER /* * Hook the return address and push it in the stack of return addresses |