diff options
| author |   Don Dugger <donald.d.dugger@intel.com> | 2015-10-29 22:15:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-10-29 22:15:25 +0000 |
| commit | afc76d554ed517e38d46b6b182a7016406a1323f (patch) | |
| tree | 06133cb33a43488837ea67667458e1582f2f40ce /kernel/arch/m32r | |
| parent | 41f827bfbb10e03c4d228fbcc801dd51fb9983b0 (diff) | |
| parent | ec0a2ed6d8a5e555edef907895c041e285fdb495 (diff) | |
Merge "These changes are a raw update to a vanilla kernel 4.1.10, with the recently announced rt patch patch-4.1.10-rt10.patch. No further changes needed."
Diffstat (limited to 'kernel/arch/m32r')
| -rw-r--r-- | kernel/arch/m32r/boot/compressed/misc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/arch/m32r/boot/compressed/misc.c b/kernel/arch/m32r/boot/compressed/misc.c index 28a09529f..3a7692745 100644 --- a/kernel/arch/m32r/boot/compressed/misc.c +++ b/kernel/arch/m32r/boot/compressed/misc.c @@ -86,6 +86,7 @@ decompress_kernel(int mmu_on, unsigned char *zimage_data, free_mem_end_ptr = free_mem_ptr + BOOT_HEAP_SIZE; puts("\nDecompressing Linux... "); - decompress(input_data, input_len, NULL, NULL, output_data, NULL, error); + __decompress(input_data, input_len, NULL, NULL, output_data, 0, + NULL, error); puts("done.\nBooting the kernel.\n"); } |