diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2011-03-15 17:08:32 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2011-03-15 17:08:24 +0100 |
| commit | d7b081ac0b8eee5f2a58123235061ee1b99a4f4d (patch) | |
| tree | a1deecb029e2a511112e2364e6878bf843d9773c /arch/s390/boot/compressed/misc.c | |
| parent | 3041b6ab5f36ac303981e9f170ff2ae43dc9d125 (diff) | |
| download | linux-d7b081ac0b8eee5f2a58123235061ee1b99a4f4d.tar.bz2 | |
[S390] support XZ compressed kernel
Add support for XZ compressed kernel. Same as on x86 and sh.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/boot/compressed/misc.c')
| -rw-r--r-- | arch/s390/boot/compressed/misc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/s390/boot/compressed/misc.c b/arch/s390/boot/compressed/misc.c index 2751b3a8a66f..028f23ea81d1 100644 --- a/arch/s390/boot/compressed/misc.c +++ b/arch/s390/boot/compressed/misc.c @@ -19,6 +19,7 @@ #undef memset #undef memcpy #undef memmove +#define memmove memmove #define memzero(s, n) memset((s), 0, (n)) /* Symbols defined by linker scripts */ @@ -54,6 +55,10 @@ static unsigned long free_mem_end_ptr; #include "../../../../lib/decompress_unlzo.c" #endif +#ifdef CONFIG_KERNEL_XZ +#include "../../../../lib/decompress_unxz.c" +#endif + extern _sclp_print_early(const char *); int puts(const char *s) |