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

Commit f431972e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.4.62 into android-4.4 



Changes in 4.4.62:
	drm/i915: Avoid tweaking evaluation thresholds on Baytrail v3
	drm/i915: Stop using RP_DOWN_EI on Baytrail
	usb: dwc3: gadget: delay unmap of bounced requests
	mtd: bcm47xxpart: fix parsing first block after aligned TRX
	MIPS: Introduce irq_stack
	MIPS: Stack unwinding while on IRQ stack
	MIPS: Only change $28 to thread_info if coming from user mode
	MIPS: Switch to the irq_stack in interrupts
	MIPS: Select HAVE_IRQ_EXIT_ON_IRQ_STACK
	MIPS: IRQ Stack: Fix erroneous jal to plat_irq_dispatch
	crypto: caam - fix RNG deinstantiation error checking
	net/packet: fix overflow in check for priv area size
	blk-mq: Avoid memory reclaim when remapping queues
	usb: hub: Wait for connection to be reestablished after port reset
	net/mlx4_en: Fix bad WQE issue
	net/mlx4_core: Fix racy CQ (Completion Queue) free
	net/mlx4_core: Fix when to save some qp context flags for dynamic VST to VGT transitions
	ibmveth: set correct gso_size and gso_type
	Linux 4.4.62

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 2a8af3ae a80c068f

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 61

SUBLEVEL = 62

EXTRAVERSION =

NAME = Blurry Fish Butt

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
@@ -101,6 +101,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();

}