Merge "Merge remote-tracking branch '4.9/tmp-49794787' into msm-4.9" into msm-4.9

VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 22

SUBLEVEL = 23

EXTRAVERSION =

NAME = Roaring Lionus

	select HAVE_CONTEXT_TRACKING

	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_IDE

	select HAVE_IRQ_EXIT_ON_IRQ_STACK

	select HAVE_OPROFILE

	select HAVE_PERF_EVENTS

	select PERF_USE_VMALLOC

#include <irq.h>

#define IRQ_STACK_SIZE			THREAD_SIZE

extern void *irq_stack[NR_CPUS];

static inline bool on_irq_stack(int cpu, unsigned long sp)

{

	unsigned long low = (unsigned long)irq_stack[cpu];

	unsigned long high = low + IRQ_STACK_SIZE;

	return (low <= sp && sp <= high);

}

#ifdef CONFIG_I8259

static inline int irq_canonicalize(int irq)

{

		LONG_S	$25, PT_R25(sp)

		LONG_S	$28, PT_R28(sp)

		LONG_S	$31, PT_R31(sp)

		/* Set thread_info if we're coming from user mode */

		mfc0	k0, CP0_STATUS

		sll	k0, 3		/* extract cu0 bit */

		bltz	k0, 9f

		ori	$28, sp, _THREAD_MASK

		xori	$28, _THREAD_MASK

#ifdef CONFIG_CPU_CAVIUM_OCTEON

		.set    mips64

		pref    0, 0($28)       /* Prefetch the current pointer */

#endif

9:

		.set	pop

		.endm

	OFFSET(TI_REGS, thread_info, regs);

	DEFINE(_THREAD_SIZE, THREAD_SIZE);

	DEFINE(_THREAD_MASK, THREAD_MASK);

	DEFINE(_IRQ_STACK_SIZE, IRQ_STACK_SIZE);

	BLANK();

}