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

Commit c6a96219 authored by Kyle Yan's avatar Kyle Yan
Browse files

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



* 4.9/tmp-49794787:
  Linux 4.9.23
  dma-buf: add support for compat ioctl
  net/mlx4_core: Fix when to save some qp context flags for dynamic VST to VGT transitions
  net/mlx4_core: Fix racy CQ (Completion Queue) free
  net/mlx4_en: Fix bad WQE issue
  usb: hub: Wait for connection to be reestablished after port reset
  blk-mq: Avoid memory reclaim when remapping queues
  net/packet: fix overflow in check for priv area size
  Revert "drm/i915/execlists: Reset RING registers upon resume"
  crypto: caam - fix invalid dereference in caam_rsa_init_tfm()
  crypto: caam - fix RNG deinstantiation error checking
  MIPS: IRQ Stack: Fix erroneous jal to plat_irq_dispatch
  MIPS: Select HAVE_IRQ_EXIT_ON_IRQ_STACK
  MIPS: Switch to the irq_stack in interrupts
  MIPS: Only change $28 to thread_info if coming from user mode
  MIPS: Stack unwinding while on IRQ stack
  MIPS: Introduce irq_stack
  mtd: bcm47xxpart: fix parsing first block after aligned TRX
  rt2x00: Fix incorrect usage of CONFIG_RT2X00_LIB_USB
  rt2x00usb: do not anchor rx and tx urb's
  rt2x00usb: fix anchor initialization
  i2c: bcm2835: Fix hang for writing messages larger than 16 bytes
  orangefs: fix buffer size mis-match between kernel space and user space.
  orangefs: Dan Carpenter influenced cleanups...
  orangefs: fix memory leak of string 'new' on exit path
  drm/i915: Avoid rcu_barrier() from reclaim paths (shrinker)
  drm/i915: Stop using RP_DOWN_EI on Baytrail
  drm/i915: Drop support for I915_EXEC_CONSTANTS_* execbuf parameters.
  drm/i915: Only enable hotplug interrupts if the display interrupts are enabled
  drm/i915: Avoid tweaking evaluation thresholds on Baytrail v3
  drm/i915: Nuke debug messages from the pipe update critical section
  drm/i915/gen9: Increase PCODE request timeout to 50ms
  UPSTREAM: char: lack of bool string made CONFIG_DEVPORT always on
  UPSTREAM: net: socket: Make unnecessarily global sockfs_setattr() static
  UPSTREAM: net: ipv4: Don't crash if passing a null sk to ip_do_redirect.
  UPSTREAM: net/packet: fix overflow in check for priv area size

Change-Id: I45d48ae8766a3fd80e4a31669da15bd3d4dc2d82
Signed-off-by: default avatarKyle Yan <kyan@codeaurora.org>
parents d78ef3b5 49794787

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 22

SUBLEVEL = 23

EXTRAVERSION =

NAME = Roaring Lionus

arch/mips/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ config MIPS 
	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

arch/mips/include/asm/irq.h

+12 −0
Original line number Diff line number Diff line
@@ -17,6 +17,18 @@ 


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

{

arch/mips/include/asm/stackframe.h

+7 −0
Original line number Diff line number Diff line
@@ -216,12 +216,19 @@ 
		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

arch/mips/kernel/asm-offsets.c

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ void output_thread_info_defines(void) 
	OFFSET(TI_REGS, thread_info, regs);

	DEFINE(_THREAD_SIZE, THREAD_SIZE);

	DEFINE(_THREAD_MASK, THREAD_MASK);

	DEFINE(_IRQ_STACK_SIZE, IRQ_STACK_SIZE);

	BLANK();

}