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

Commit 8ea0de4b authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Nicolas Pitre
Browse files

ARM: zImage: remove the static qualifier from global data variables 



To be able to relocate the .bss section at run time independently from
the rest of the code, we must make sure that no GOTOFF relocations are
used with .bss symbols.  This usually means that no global variables can
be marked static unless they're also const.

Let's remove the static qualifier from current offenders, or turn them
into const variables when possible.  Next commit will ensure the build
fails if one of those is reintroduced due to otherwise enforced coding
standards for the kernel.

Signed-off-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
parent ccc1c7c6

arch/arm/mach-davinci/include/mach/uncompress.h

+3 −2
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ 


#include <mach/serial.h>



static u32 *uart;

static u32 *uart_info = (u32 *)(DAVINCI_UART_INFO);

u32 *uart;



/* PORT_16C550A, in polled non-fifo mode */

static void putc(char c)
@@ -44,6 +43,8 @@ static inline void flush(void) 


static inline void set_uart_info(u32 phys, void * __iomem virt)

{

	u32 *uart_info = (u32 *)(DAVINCI_UART_INFO);



	uart = (u32 *)phys;

	uart_info[0] = phys;

	uart_info[1] = (u32)virt;

arch/arm/mach-gemini/include/mach/uncompress.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/serial_reg.h>

#include <mach/hardware.h>



static volatile unsigned long *UART = (unsigned long *)GEMINI_UART_BASE;

static volatile unsigned long * const UART = (unsigned long *)GEMINI_UART_BASE;



/*

 * The following code assumes the serial port has already been

arch/arm/mach-iop32x/include/mach/uncompress.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include <linux/serial_reg.h>

#include <mach/hardware.h>



static volatile u8 *uart_base;

volatile u8 *uart_base;



#define TX_DONE		(UART_LSR_TEMT | UART_LSR_THRE)

arch/arm/mach-iop33x/include/mach/uncompress.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include <linux/serial_reg.h>

#include <mach/hardware.h>



static volatile u32 *uart_base;

volatile u32 *uart_base;



#define TX_DONE		(UART_LSR_TEMT | UART_LSR_THRE)

arch/arm/mach-ixp4xx/include/mach/uncompress.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#define TX_DONE (UART_LSR_TEMT|UART_LSR_THRE)



static volatile u32* uart_base;

volatile u32* uart_base;



static inline void putc(int c)

{