Commit 9c3205b2 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Heiko Carstens
Browse files

s390/boot: cleanup decompressor header files 



Move declarations to appropriate header files. Instead of cryptic
casting directly assign struct vmlinux_info type to _vmlinux_info
linker script variable - wich it actually is.

Reviewed-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent e7b48169

arch/s390/boot/boot.h

+22 −2
Original line number Diff line number Diff line
@@ -8,10 +8,26 @@ 


#ifndef __ASSEMBLY__



struct vmlinux_info {

	unsigned long default_lma;

	void (*entry)(void);

	unsigned long image_size;	/* does not include .bss */

	unsigned long bss_size;		/* uncompressed image .bss size */

	unsigned long bootdata_off;

	unsigned long bootdata_size;

	unsigned long bootdata_preserved_off;

	unsigned long bootdata_preserved_size;

	unsigned long dynsym_start;

	unsigned long rela_dyn_start;

	unsigned long rela_dyn_end;

	unsigned long amode31_size;

};



void startup_kernel(void);

unsigned long detect_memory(void);

bool is_ipl_block_dump(void);

void store_ipl_parmblock(void);

unsigned long read_ipl_report(unsigned long safe_offset);

void setup_boot_command_line(void);

void parse_boot_command_line(void);

void verify_facilities(void);
@@ -20,6 +36,7 @@ void sclp_early_setup_buffer(void); 
void print_pgm_check_info(void);

unsigned long get_random_base(unsigned long safe_addr);

void __printf(1, 2) decompressor_printk(const char *fmt, ...);

void error(char *m);



/* Symbols defined by linker scripts */

extern const char kernel_version[];
@@ -31,8 +48,11 @@ extern char __boot_data_start[], __boot_data_end[]; 
extern char __boot_data_preserved_start[], __boot_data_preserved_end[];

extern char _decompressor_syms_start[], _decompressor_syms_end[];

extern char _stack_start[], _stack_end[];



unsigned long read_ipl_report(unsigned long safe_offset);

extern char _end[];

extern unsigned char _compressed_start[];

extern unsigned char _compressed_end[];

extern struct vmlinux_info _vmlinux_info;

#define vmlinux _vmlinux_info



#endif /* __ASSEMBLY__ */

#endif /* BOOT_BOOT_H */

arch/s390/boot/decompressor.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/string.h>

#include <asm/page.h>

#include "decompressor.h"

#include "boot.h"



/*

 * gzip declarations

arch/s390/boot/decompressor.h

+0 −26
Original line number Diff line number Diff line
@@ -2,37 +2,11 @@ 
#ifndef BOOT_COMPRESSED_DECOMPRESSOR_H

#define BOOT_COMPRESSED_DECOMPRESSOR_H



#include <linux/stddef.h>



#ifdef CONFIG_KERNEL_UNCOMPRESSED

static inline void *decompress_kernel(void) { return NULL; }

#else

void *decompress_kernel(void);

#endif

unsigned long mem_safe_offset(void);

void error(char *m);



struct vmlinux_info {

	unsigned long default_lma;

	void (*entry)(void);

	unsigned long image_size;	/* does not include .bss */

	unsigned long bss_size;		/* uncompressed image .bss size */

	unsigned long bootdata_off;

	unsigned long bootdata_size;

	unsigned long bootdata_preserved_off;

	unsigned long bootdata_preserved_size;

	unsigned long dynsym_start;

	unsigned long rela_dyn_start;

	unsigned long rela_dyn_end;

	unsigned long amode31_size;

};



/* Symbols defined by linker scripts */

extern char _end[];

extern unsigned char _compressed_start[];

extern unsigned char _compressed_end[];

extern char _vmlinux_info[];



#define vmlinux (*(struct vmlinux_info *)_vmlinux_info)



#endif /* BOOT_COMPRESSED_DECOMPRESSOR_H */