1b3fe856bd
miceroblaze:allmodconfig fails to build, complaining that
early_printk is redeclared.
include/linux/printk.h:114:6: error: static declaration of 'early_printk'
follows non-static declaration
void early_printk(const char *s, ...) { }
^
In file included from arch/microblaze/include/asm/page.h:19:0,
from arch/microblaze/include/asm/io.h:15,
from include/linux/io.h:22,
from kernel/irq/generic-chip.c:6:
arch/microblaze/include/asm/setup.h:22:6:
note: previous declaration of 'early_printk' was here
void early_printk(const char *fmt, ...);
This happens because CONFIG_EARLY_PRINTK is not enabled in this
configuration.
The architecture-specific declaration is not needed; drop it.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
51 lines
1.4 KiB
C
51 lines
1.4 KiB
C
/*
|
|
* Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu>
|
|
* Copyright (C) 2007-2009 PetaLogix
|
|
* Copyright (C) 2006 Atmark Techno, Inc.
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*/
|
|
#ifndef _ASM_MICROBLAZE_SETUP_H
|
|
#define _ASM_MICROBLAZE_SETUP_H
|
|
|
|
#include <uapi/asm/setup.h>
|
|
|
|
# ifndef __ASSEMBLY__
|
|
extern unsigned int boot_cpuid; /* move to smp.h */
|
|
|
|
extern char cmd_line[COMMAND_LINE_SIZE];
|
|
|
|
extern char *klimit;
|
|
|
|
int setup_early_printk(char *opt);
|
|
void remap_early_printk(void);
|
|
void disable_early_printk(void);
|
|
|
|
void microblaze_heartbeat(void);
|
|
void microblaze_setup_heartbeat(void);
|
|
|
|
# ifdef CONFIG_MMU
|
|
extern void mmu_reset(void);
|
|
extern void early_console_reg_tlb_alloc(unsigned int addr);
|
|
# endif /* CONFIG_MMU */
|
|
|
|
extern void of_platform_reset_gpio_probe(void);
|
|
|
|
void time_init(void);
|
|
void init_IRQ(void);
|
|
void machine_early_init(const char *cmdline, unsigned int ram,
|
|
unsigned int fdt, unsigned int msr, unsigned int tlb0,
|
|
unsigned int tlb1);
|
|
|
|
void machine_restart(char *cmd);
|
|
void machine_shutdown(void);
|
|
void machine_halt(void);
|
|
void machine_power_off(void);
|
|
|
|
extern void *alloc_maybe_bootmem(size_t size, gfp_t mask);
|
|
extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask);
|
|
|
|
# endif /* __ASSEMBLY__ */
|
|
#endif /* _ASM_MICROBLAZE_SETUP_H */
|