diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-03 14:14:08 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-03 14:14:09 +1000 |
| commit | 9ffdb5467953674fa1d0a206a6fe8fa96cc5659b (patch) | |
| tree | 7651ff860dd4df51cd256b5cfa11c63397478143 /arch/s390 | |
| parent | f9fec70340e943839b0e3f9b1219d19fe8f3b4d5 (diff) | |
| parent | 0931fbddc5f236d63b39077a0926b8c6c32656c2 (diff) | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/Kconfig | 1 | ||||
| -rw-r--r-- | arch/s390/boot/compressed/misc.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 4827870f7a6d..1d57000b1b24 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -48,6 +48,7 @@ config ARCH_SUPPORTS_DEBUG_PAGEALLOC config KEXEC def_bool y + select KEXEC_CORE config AUDIT_ARCH def_bool y diff --git a/arch/s390/boot/compressed/misc.c b/arch/s390/boot/compressed/misc.c index 42506b371b74..4da604ebf6fd 100644 --- a/arch/s390/boot/compressed/misc.c +++ b/arch/s390/boot/compressed/misc.c @@ -167,7 +167,7 @@ unsigned long decompress_kernel(void) #endif puts("Uncompressing Linux... "); - decompress(input_data, input_len, NULL, NULL, output, NULL, error); + __decompress(input_data, input_len, NULL, NULL, output, 0, NULL, error); puts("Ok, booting the kernel.\n"); return (unsigned long) output; } |