diff options
| author | Michael Holzheu <holzheu@linux.vnet.ibm.com> | 2013-11-13 10:38:27 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-11-15 14:08:41 +0100 |
| commit | 7b50da53f6ad2048241bef232bfc22a132a40283 (patch) | |
| tree | d8cdf310a750de86e63c4831de2fa22affa350b4 /arch/s390/kernel/early.c | |
| parent | s390/sclp: Move early code from sclp_cmd.c to sclp_early.c (diff) | |
| download | linux-7b50da53f6ad2048241bef232bfc22a132a40283.tar.xz linux-7b50da53f6ad2048241bef232bfc22a132a40283.zip | |
s390/sclp: Consolidate early sclp init calls to sclp_early_detect()
The new function calls the old ones. The sclp_event_mask_early() is removed
and replaced by one invocation of sclp_set_event_mask(0, 0).
Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/early.c')
| -rw-r--r-- | arch/s390/kernel/early.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c index c0462f45cf1b..fca20b5fe79e 100644 --- a/arch/s390/kernel/early.c +++ b/arch/s390/kernel/early.c @@ -483,8 +483,7 @@ void __init startup_init(void) detect_diag44(); detect_machine_facilities(); setup_topology(); - sclp_facilities_detect(); - sclp_hsa_size_detect(); + sclp_early_detect(); #ifdef CONFIG_DYNAMIC_FTRACE S390_lowcore.ftrace_func = (unsigned long)ftrace_caller; #endif |