Commit f33fda22 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'microblaze-v6.10' of git://git.monstr.eu/linux-2.6-microblaze 

Pull microblaze updates from Michal Simek:

 - Cleanup code around removed early_printk

* tag 'microblaze-v6.10' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Remove early printk call from cpuinfo-static.c
  microblaze: Remove gcc flag for non existing early_printk.c file
parents 0e22bedd 58d64750

arch/microblaze/kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER 
# Do not trace early boot code and low level code

CFLAGS_REMOVE_timer.o = -pg

CFLAGS_REMOVE_intc.o = -pg

CFLAGS_REMOVE_early_printk.o = -pg

CFLAGS_REMOVE_ftrace.o = -pg

CFLAGS_REMOVE_process.o = -pg

endif

arch/microblaze/kernel/cpu/cpuinfo-static.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ static const char family_string[] = CONFIG_XILINX_MICROBLAZE0_FAMILY; 
static const char cpu_ver_string[] = CONFIG_XILINX_MICROBLAZE0_HW_VER;



#define err_printk(x) \

	early_printk("ERROR: Microblaze " x "-different for kernel and DTS\n");

	pr_err("ERROR: Microblaze " x "-different for kernel and DTS\n");



void __init set_cpuinfo_static(struct cpuinfo *ci, struct device_node *cpu)

{