Commit 9d1f3aa6 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Russell King (Oracle)
Browse files

ARM: 9311/1: decompressor: move function prototypes to misc.h 



A number of prototypes are missing for the decompressor, some
of them are in the .c files that contain the callers, but are
invisible at the function definition:

arch/arm/boot/compressed/misc.c:129:17: error: no previous prototype for '__div0' [-Werror=missing-prototypes]
arch/arm/boot/compressed/misc.c:138:1: error: no previous prototype for 'decompress_kernel' [-Werror=missing-prototypes]
arch/arm/boot/compressed/misc.c:163:6: error: no previous prototype for 'fortify_panic' [-Werror=missing-prototypes]
arch/arm/boot/compressed/decompress.c:63:5: error: no previous prototype for 'do_decompress' [-Werror=missing-prototypes]
arch/arm/boot/compressed/fdt_check_mem_start.c:63:10: error: no previous prototype for 'fdt_check_mem_start' [-Werror=missing-prototypes]

Move these all to misc.h so they are visible by the callee as well.

Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
parent c9a1d4f6

arch/arm/boot/compressed/atags_to_fdt.c

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

#include <asm/setup.h>

#include <libfdt.h>

#include "misc.h"



#if defined(CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND)

#define do_extend_cmdline 1

arch/arm/boot/compressed/fdt_check_mem_start.c

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

#include <linux/libfdt.h>

#include <linux/sizes.h>

#include "misc.h"



static const void *get_prop(const void *fdt, const char *node_path,

			    const char *property, int minlen)

arch/arm/boot/compressed/misc.c

+0 −6
Original line number Diff line number Diff line
@@ -103,9 +103,6 @@ static void putstr(const char *ptr) 
/*

 * gzip declarations

 */

extern char input_data[];

extern char input_data_end[];



unsigned char *output_data;



unsigned long free_mem_ptr;
@@ -131,9 +128,6 @@ asmlinkage void __div0(void) 
	error("Attempting division by 0!");

}



extern int do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x));





void

decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p,

		unsigned long free_mem_ptr_end_p,

arch/arm/boot/compressed/misc.h

+11 −0
Original line number Diff line number Diff line
@@ -6,5 +6,16 @@ 
void error(char *x) __noreturn;

extern unsigned long free_mem_ptr;

extern unsigned long free_mem_end_ptr;

void __div0(void);

void

decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p,

		  unsigned long free_mem_ptr_end_p, int arch_id);

void fortify_panic(const char *name);

int atags_to_fdt(void *atag_list, void *fdt, int total_space);

uint32_t fdt_check_mem_start(uint32_t mem_start, const void *fdt);

int do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x));



extern char input_data[];

extern char input_data_end[];



#endif