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

Commit 22c3b152 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'microblaze-v4.18-rc3' of git://git.monstr.eu/linux-2.6-microblaze 

Pull microblaze fixes from Michal Simek:

 - fix architecture gpio heart beat code

 - add new syscalls

 - remove unused xlnx,compound handling

 - remove platform.c

* tag 'microblaze-v4.18-rc3' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: consolidate GPIO reset handling
  microblaze: remove unecessary of_platform_bus_probe call
  microblaze: Add new syscalls io_pgetevents and rseq
  microblaze: Remove architecture heart beat code
  microblaze: heartbeat: fix missing prom.h include
parents debd52a0 45df561a

arch/microblaze/Kconfig.debug

+0 −7
Original line number Diff line number Diff line
@@ -8,11 +8,4 @@ config TRACE_IRQFLAGS_SUPPORT 


source "lib/Kconfig.debug"



config HEART_BEAT

	bool "Heart beat function for kernel"

	default n

	help

	  This option turns on/off heart beat kernel functionality.

	  First GPIO node is taken.



endmenu

arch/microblaze/include/asm/setup.h

+0 −5
Original line number Diff line number Diff line
@@ -19,15 +19,10 @@ extern char cmd_line[COMMAND_LINE_SIZE]; 


extern char *klimit;



void microblaze_heartbeat(void);

void microblaze_setup_heartbeat(void);



#   ifdef CONFIG_MMU

extern void mmu_reset(void);

#   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,

arch/microblaze/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -38,6 +38,6 @@ 


#endif /* __ASSEMBLY__ */



#define __NR_syscalls         399

#define __NR_syscalls         401



#endif /* _ASM_MICROBLAZE_UNISTD_H */

arch/microblaze/include/uapi/asm/unistd.h

+2 −0
Original line number Diff line number Diff line
@@ -415,5 +415,7 @@ 
#define __NR_pkey_alloc		396

#define __NR_pkey_free		397

#define __NR_statx		398

#define __NR_io_pgetevents	399

#define __NR_rseq		400



#endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */

arch/microblaze/kernel/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ ifdef CONFIG_FUNCTION_TRACER 
CFLAGS_REMOVE_timer.o = -pg

CFLAGS_REMOVE_intc.o = -pg

CFLAGS_REMOVE_early_printk.o = -pg

CFLAGS_REMOVE_heartbeat.o = -pg

CFLAGS_REMOVE_ftrace.o = -pg

CFLAGS_REMOVE_process.o = -pg

endif
@@ -17,12 +16,11 @@ extra-y := head.o vmlinux.lds 


obj-y += dma.o exceptions.o \

	hw_exception_handler.o irq.o \

	platform.o process.o prom.o ptrace.o \

	process.o prom.o ptrace.o \

	reset.o setup.o signal.o sys_microblaze.o timer.o traps.o unwind.o



obj-y += cpu/



obj-$(CONFIG_HEART_BEAT)	+= heartbeat.o

obj-$(CONFIG_MODULES)		+= microblaze_ksyms.o module.o

obj-$(CONFIG_MMU)		+= misc.o

obj-$(CONFIG_STACKTRACE)	+= stacktrace.o