Commit 6b6e177d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 

Pull arch/tile updates from Chris Metcalf:
 "These are mostly nohz_full changes, plus a smattering of minor fixes
  (notably a couple for ftrace)"

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  tile: nohz: warn if nohz_full uses hypervisor shared cores
  tile: ftrace: fix function_graph tracer issues
  tile: map data region shadow of kernel as R/W
  tile: support CONTEXT_TRACKING and thus NOHZ_FULL
  tile: support arch_irq_work_raise
  arch: tile: fix null pointer dereference on pt_regs pointer
  tile/elf: reorganize notify_exec()
  tile: use si_int instead of si_ptr for compat_siginfo
parents bfaf2450 128f3cb9

arch/tile/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ config TILE 
	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select HAVE_DEBUG_STACKOVERFLOW

	select ARCH_WANT_FRAME_POINTERS

	select HAVE_CONTEXT_TRACKING



# FIXME: investigate whether we need/want these options.

#	select HAVE_IOREMAP_PROT

arch/tile/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ generic-y += ioctl.h 
generic-y += ioctls.h

generic-y += ipcbuf.h

generic-y += irq_regs.h

generic-y += irq_work.h

generic-y += local.h

generic-y += local64.h

generic-y += mcs_spinlock.h

arch/tile/include/asm/ftrace.h

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
#ifndef __ASSEMBLY__

extern void __mcount(void);



#define ARCH_SUPPORTS_FTRACE_OPS 1



#ifdef CONFIG_DYNAMIC_FTRACE

static inline unsigned long ftrace_call_adjust(unsigned long addr)

{

arch/tile/include/asm/irq_work.h

0 → 100644
+14 −0
Original line number Diff line number Diff line 
#ifndef __ASM_IRQ_WORK_H

#define __ASM_IRQ_WORK_H



static inline bool arch_irq_work_has_interrupt(void)

{

#ifdef CONFIG_SMP

	extern bool self_interrupt_ok;

	return self_interrupt_ok;

#else

	return false;

#endif

}



#endif /* __ASM_IRQ_WORK_H */

arch/tile/include/asm/smp.h

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ static inline int xy_to_cpu(int x, int y) 
#define MSG_TAG_STOP_CPU		2

#define MSG_TAG_CALL_FUNCTION_MANY	3

#define MSG_TAG_CALL_FUNCTION_SINGLE	4

#define MSG_TAG_IRQ_WORK		5



/* Hook for the generic smp_call_function_many() routine. */

static inline void arch_send_call_function_ipi_mask(struct cpumask *mask)

CRA Git | Maintained and supported by SUSTech CRA and CCSE