Commit 8f34d037 authored by popcornmix's avatar popcornmix
Browse files

Merge remote-tracking branch 'stable/linux-4.9.y' into rpi-4.9.y

parents 2dddb041 4d4a6a3f

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 57

SUBLEVEL = 58

EXTRAVERSION =

NAME = Roaring Lionus

arch/mips/include/asm/irq.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <irq.h>



#define IRQ_STACK_SIZE			THREAD_SIZE

#define IRQ_STACK_START			(IRQ_STACK_SIZE - sizeof(unsigned long))

#define IRQ_STACK_START			(IRQ_STACK_SIZE - 16)



extern void *irq_stack[NR_CPUS];

arch/powerpc/perf/isa207-common.h

+4 −0
Original line number Diff line number Diff line
@@ -201,6 +201,10 @@ 
	CNST_PMC_VAL(1) | CNST_PMC_VAL(2) | CNST_PMC_VAL(3) | \

	CNST_PMC_VAL(4) | CNST_PMC_VAL(5) | CNST_PMC_VAL(6) | CNST_NC_VAL



/*

 * Lets restrict use of PMC5 for instruction counting.

 */

#define P9_DD1_TEST_ADDER	(ISA207_TEST_ADDER | CNST_PMC_VAL(5))



/* Bits in MMCR1 for PowerISA v2.07 */

#define MMCR1_UNIT_SHIFT(pmc)		(60 - (4 * ((pmc) - 1)))

arch/powerpc/perf/power9-pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ static struct power_pmu power9_pmu = { 
	.name			= "POWER9",

	.n_counter		= MAX_PMU_COUNTERS,

	.add_fields		= ISA207_ADD_FIELDS,

	.test_adder		= ISA207_TEST_ADDER,

	.test_adder		= P9_DD1_TEST_ADDER,

	.compute_mmcr		= isa207_compute_mmcr,

	.config_bhrb		= power9_config_bhrb,

	.bhrb_filter_map	= power9_bhrb_filter_map,

arch/sparc/include/asm/setup.h

+4 −1
Original line number Diff line number Diff line
@@ -59,8 +59,11 @@ extern atomic_t dcpage_flushes; 
extern atomic_t dcpage_flushes_xcall;



extern int sysctl_tsb_ratio;

#endif



#ifdef CONFIG_SERIAL_SUNHV

void sunhv_migrate_hvcons_irq(int cpu);

#endif

#endif

void sun_do_break(void);

extern int stop_a_enabled;

extern int scons_pwroff;