dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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: Nicolas Pitre <nicolas.pitre@linaro.org>
Tested-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Nicolas Pitre 2011-04-28 17:00:17 -04:00 committed by Nicolas Pitre
parent ccc1c7c6c2
commit 8ea0de4b88
17 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-davinci/include/mach/uncompress.h
View File

@ -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;

2
arch/arm/mach-gemini/include/mach/uncompress.h
View File

@ -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

2
arch/arm/mach-iop32x/include/mach/uncompress.h
View File

@ -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)

2
arch/arm/mach-iop33x/include/mach/uncompress.h
View File

@ -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)

2
arch/arm/mach-ixp4xx/include/mach/uncompress.h
View File

@ -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)
{

2
arch/arm/mach-mmp/include/mach/uncompress.h
View File

@ -14,7 +14,7 @@
#define UART2_BASE (APB_PHYS_BASE + 0x17000)
#define UART3_BASE (APB_PHYS_BASE + 0x18000)
static volatile unsigned long *UART;
volatile unsigned long *UART;
static inline void putc(char c)
{

2
arch/arm/mach-mxs/include/mach/uncompress.h
View File

@ -20,7 +20,7 @@
#include <asm/mach-types.h>
static unsigned long mxs_duart_base;
unsigned long mxs_duart_base;
#define MXS_DUART(x) (*(volatile unsigned long *)(mxs_duart_base + (x)))

2
arch/arm/mach-ns9xxx/include/mach/uncompress.h
View File

@ -20,7 +20,7 @@ static void putc_dummy(char c, void __iomem *base)
/* nothing */
}
static int timeout;
int timeout;
static void putc_ns9360(char c, void __iomem *base)
{

2
arch/arm/mach-nuc93x/include/mach/uncompress.h
View File

@ -27,7 +27,7 @@
#define arch_decomp_wdog()
#define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE)
static u32 * uart_base = (u32 *)UART0_PA;
static u32 * const uart_base = (u32 *)UART0_PA;
static void putc(int ch)
{

6
arch/arm/mach-pxa/include/mach/uncompress.h
View File

@ -16,9 +16,9 @@
#define BTUART_BASE (0x40200000)
#define STUART_BASE (0x40700000)
static unsigned long uart_base;
static unsigned int uart_shift;
static unsigned int uart_is_pxa;
unsigned long uart_base;
unsigned int uart_shift;
unsigned int uart_is_pxa;
static inline unsigned char uart_read(int offset)
{

12
arch/arm/mach-rpc/include/mach/uncompress.h
View File

@ -66,12 +66,12 @@ extern __attribute__((pure)) struct param_struct *params(void);
#define params (params())
#ifndef STANDALONE_DEBUG
static unsigned long video_num_cols;
static unsigned long video_num_rows;
static unsigned long video_x;
static unsigned long video_y;
static unsigned char bytes_per_char_v;
static int white;
unsigned long video_num_cols;
unsigned long video_num_rows;
unsigned long video_x;
unsigned long video_y;
unsigned char bytes_per_char_v;
int white;
/*
* This does not append a newline

6
arch/arm/mach-s5p64x0/include/mach/uncompress.h
View File

@ -24,8 +24,8 @@ typedef unsigned int upf_t; /* cannot include linux/serial_core.h */
/* uart setup */
static unsigned int fifo_mask;
static unsigned int fifo_max;
unsigned int fifo_mask;
unsigned int fifo_max;
/* forward declerations */
@ -43,7 +43,7 @@ static void arch_detect_cpu(void);
/* how many bytes we allow into the FIFO at a time in FIFO mode */
#define FIFO_MAX (14)
static unsigned long uart_base;
unsigned long uart_base;
static __inline__ void get_uart_base(void)
{

2
arch/arm/mach-ux500/include/mach/uncompress.h
View File

@ -24,7 +24,7 @@
#include <linux/amba/serial.h>
#include <mach/hardware.h>
static u32 ux500_uart_base;
u32 ux500_uart_base;
static void putc(const char c)
{

2
arch/arm/mach-w90x900/include/mach/uncompress.h
View File

@ -27,7 +27,7 @@
#define arch_decomp_wdog()
#define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE)
static volatile u32 * uart_base = (u32 *)UART0_PA;
static volatile u32 * const uart_base = (u32 *)UART0_PA;
static void putc(int ch)
{

2
arch/arm/plat-mxc/include/mach/uncompress.h
View File

@ -21,7 +21,7 @@
#include <asm/mach-types.h>
static unsigned long uart_base;
unsigned long uart_base;
#define UART(x) (*(volatile unsigned long *)(uart_base + (x)))

4
arch/arm/plat-omap/include/plat/uncompress.h
View File

@ -27,8 +27,8 @@
#define MDR1_MODE_MASK 0x07
static volatile u8 *uart_base;
static int uart_shift;
volatile u8 *uart_base;
int uart_shift;
/*
* Store the DEBUG_LL uart number into memory.

4
arch/arm/plat-samsung/include/plat/uncompress.h
View File

@ -18,8 +18,8 @@ typedef unsigned int upf_t; /* cannot include linux/serial_core.h */
/* uart setup */
static unsigned int fifo_mask;
static unsigned int fifo_max;
unsigned int fifo_mask;
unsigned int fifo_max;
/* forward declerations */