rename __initdata to __early_initdata
The __initdata define was present before Jean-Christophe added it as fake value for Linux compatibility. Rename the previous define to a different name to avoid clashes Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
e4c138e028
commit
2db4aa5c32
|
@ -51,7 +51,7 @@ static void display_banner (void)
|
|||
printf(RELOC("Board: " CONFIG_BOARDINFO "\n"));
|
||||
}
|
||||
|
||||
static int __initdata initialized = 0;
|
||||
static int __early_initdata initialized = 0;
|
||||
|
||||
static int console_std_set(struct device_d *dev, struct param_d *param,
|
||||
const char *val)
|
||||
|
@ -246,7 +246,7 @@ int tstc(void)
|
|||
}
|
||||
EXPORT_SYMBOL(tstc);
|
||||
|
||||
void __initdata *early_console_base;
|
||||
void __early_initdata *early_console_base;
|
||||
|
||||
void console_putc(unsigned int ch, char c)
|
||||
{
|
||||
|
|
|
@ -30,7 +30,7 @@ void early_init(void);
|
|||
* put a variable into early init RAM. This section will
|
||||
* be relocated into SRAM during early init
|
||||
*/
|
||||
#define __initdata __attribute__ ((__section__ (".early_init_data")))
|
||||
#define __early_initdata __attribute__ ((__section__ (".early_init_data")))
|
||||
|
||||
/* Access init data */
|
||||
#define INITDATA(var) *(typeof(var) *)((ulong)(&var) - \
|
||||
|
@ -53,7 +53,7 @@ static inline void early_init(void)
|
|||
#define RELOC(a) a
|
||||
#define RELOC_VAR(v) v
|
||||
|
||||
#define __initdata
|
||||
#define __early_initdata
|
||||
|
||||
#define INITDATA(var) var
|
||||
|
||||
|
|
Loading…
Reference in New Issue