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

Commit 3d27bcb8 authored by Alex Shi's avatar Alex Shi
Browse files

Merge tag 'v4.4.17' into linux-linaro-lsk-v4.4 

 This is the 4.4.17 stable release
parents b0ba6b0a 133cec91

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 16

SUBLEVEL = 17

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arc/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ endif 


endif



cflags-$(CONFIG_ARC_DW2_UNWIND)		+= -fasynchronous-unwind-tables



# By default gcc 4.8 generates dwarf4 which kernel unwinder can't grok

ifeq ($(atleast_gcc48),y)

cflags-$(CONFIG_ARC_DW2_UNWIND)		+= -gdwarf-2

arch/arc/kernel/stacktrace.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ arc_unwind_core(struct task_struct *tsk, struct pt_regs *regs, 
	 * prelogue is setup (callee regs saved and then fp set and not other

	 * way around

	 */

	pr_warn("CONFIG_ARC_DW2_UNWIND needs to be enabled\n");

	pr_warn_once("CONFIG_ARC_DW2_UNWIND needs to be enabled\n");

	return 0;



#endif

arch/x86/include/asm/pvclock.h

+2 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ unsigned __pvclock_read_cycles(const struct pvclock_vcpu_time_info *src, 
	u8 ret_flags;



	version = src->version;

	/* Make the latest version visible */

	smp_rmb();



	offset = pvclock_get_nsec_offset(src);

	ret = src->system_time + offset;

arch/x86/kernel/cpu/perf_event_intel_ds.c

+8 −1
Original line number Diff line number Diff line
@@ -1110,6 +1110,13 @@ get_next_pebs_record_by_bit(void *base, void *top, int bit) 
	void *at;

	u64 pebs_status;



	/*

	 * fmt0 does not have a status bitfield (does not use

	 * perf_record_nhm format)

	 */

	if (x86_pmu.intel_cap.pebs_format < 1)

		return base;



	if (base == NULL)

		return NULL;
@@ -1195,7 +1202,7 @@ static void intel_pmu_drain_pebs_core(struct pt_regs *iregs) 
	if (!event->attr.precise_ip)

		return;



	n = (top - at) / x86_pmu.pebs_record_size;

	n = top - at;

	if (n <= 0)

		return;