mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 21:21:41 +00:00
ARM: decompressor: fix warning introduced in fortify patch
Commit ee333554fe
("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: Russell King <rmk+kernel@armlinux.org.uk>
This commit is contained in:
parent
8aeaf4a0d2
commit
5f8d561fb0
@ -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 */
|
||||
|
@ -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
|
||||
|
||||
|
10
arch/arm/boot/compressed/misc.h
Normal file
10
arch/arm/boot/compressed/misc.h
Normal file
@ -0,0 +1,10 @@
|
||||
#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
|
Loading…
Reference in New Issue
Block a user