diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-12 15:26:39 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-12 15:26:39 -0800 |
commit | 7dac7102afbeb99daa454f555f1ea1f42fad2f78 (patch) | |
tree | 024bf6c2ed2fa46cab610e6012bd3dd5f45da182 /arch/h8300/boot/compressed/misc.c | |
parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
parent | h8300: enable CLKSRC_OF (diff) | |
download | linux-dev-7dac7102afbeb99daa454f555f1ea1f42fad2f78.tar.xz linux-dev-7dac7102afbeb99daa454f555f1ea1f42fad2f78.zip |
Merge tag 'for-4.4' of git://git.osdn.jp/gitroot/uclinux-h8/linux
Pull h8300 updates from Yoshinori Sato:
"Some bug fixes"
* tag 'for-4.4' of git://git.osdn.jp/gitroot/uclinux-h8/linux:
h8300: enable CLKSRC_OF
h8300: Don't set CROSS_COMPILE unconditionally
asm-generic: {get,put}_user ptr argument evaluate only 1 time
h8300: bit io fix
h8300: zImage fix
h8300: register address fix
h8300: Fix alignment for .data
h8300: unaligned divcr register support.
Diffstat (limited to 'arch/h8300/boot/compressed/misc.c')
-rw-r--r-- | arch/h8300/boot/compressed/misc.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/h8300/boot/compressed/misc.c b/arch/h8300/boot/compressed/misc.c index c4f2cfcb117b..6029c5351895 100644 --- a/arch/h8300/boot/compressed/misc.c +++ b/arch/h8300/boot/compressed/misc.c @@ -28,7 +28,7 @@ static unsigned long free_mem_end_ptr; extern char input_data[]; extern int input_len; -static unsigned char *output; +extern char output[]; #define HEAP_SIZE 0x10000 @@ -56,15 +56,10 @@ void *memcpy(void *dest, const void *src, size_t n) static void error(char *x) { - while (1) ; /* Halt */ } -#define STACK_SIZE (4096) -long user_stack[STACK_SIZE]; -long *stack_start = &user_stack[STACK_SIZE]; - void decompress_kernel(void) { free_mem_ptr = (unsigned long)&_end; |