Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f8d561f authored by Russell King's avatar Russell King
Browse files

ARM: decompressor: fix warning introduced in fortify patch 



Commit ee333554 ("ARM: 8749/1: Kconfig: Add ARCH_HAS_FORTIFY_SOURCE")
introduced a new warning:

arch/arm/boot/compressed/misc.c: In function 'fortify_panic':
arch/arm/boot/compressed/misc.c:167:1: error: 'noreturn' function does return [-Werror]

The simple solution would be to make 'error' a noreturn function, but
this causes a prototype mismatch as the function is prototyped in
several .c files.  So, move the function prototype to a new header.

There are also a couple of variables that are also declared in several
locations.  Clean this up while we are here.

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent 8aeaf4a0

arch/arm/boot/compressed/decompress.c

+1 −4
Original line number Diff line number Diff line
@@ -6,10 +6,7 @@ 
#include <linux/stddef.h>	/* for NULL */

#include <linux/linkage.h>

#include <asm/string.h>



extern unsigned long free_mem_ptr;

extern unsigned long free_mem_end_ptr;

extern void error(char *);

#include "misc.h"



#define STATIC static

#define STATIC_RW_DATA	/* non-static please */

arch/arm/boot/compressed/misc.c

+1 −1
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ unsigned int __machine_arch_type; 
#include <linux/compiler.h>	/* for inline */

#include <linux/types.h>

#include <linux/linkage.h>

#include "misc.h"



static void putstr(const char *ptr);

extern void error(char *x);



#include CONFIG_UNCOMPRESS_INCLUDE

arch/arm/boot/compressed/misc.h

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#ifndef MISC_H

#define MISC_H



#include <linux/compiler.h>



void error(char *x) __noreturn;

extern unsigned long free_mem_ptr;

extern unsigned long free_mem_end_ptr;



#endif