Merge remote-tracking branch 'stable/linux-4.9.y' into rpi-4.9.y (be2540e5) · Commits · 方亚芬 / raspberrypi_linux

Makefile

+7 −7

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 34
		SUBLEVEL = 35
		EXTRAVERSION =
		NAME = Roaring Lionus

		@@ -651,6 +651,12 @@ KBUILD_CFLAGS += $(call cc-ifversion, -lt, 0409, \
		# Tell gcc to never replace conditional load with a non-conditional one
		KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0)

		# check for 'asm goto'
		ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)
		KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
		KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO
		endif

		include scripts/Makefile.gcc-plugins

		ifdef CONFIG_READABLE_ASM
		@@ -796,12 +802,6 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types)
		# use the deterministic mode of AR if available
		KBUILD_ARFLAGS := $(call ar-option,D)

		# check for 'asm goto'
		ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)
		KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
		KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO
		endif

		include scripts/Makefile.kasan
		include scripts/Makefile.extrawarn
		include scripts/Makefile.ubsan

+3 −2

Original line number	Diff line number	Diff line
		@@ -217,10 +217,11 @@ void update_vsyscall(struct timekeeper *tk)
		/* tkr_mono.cycle_last == tkr_raw.cycle_last */
		vdso_data->cs_cycle_last = tk->tkr_mono.cycle_last;
		vdso_data->raw_time_sec = tk->raw_time.tv_sec;
		vdso_data->raw_time_nsec = tk->raw_time.tv_nsec;
		vdso_data->raw_time_nsec = (tk->raw_time.tv_nsec <<
		tk->tkr_raw.shift) +
		tk->tkr_raw.xtime_nsec;
		vdso_data->xtime_clock_sec = tk->xtime_sec;
		vdso_data->xtime_clock_nsec = tk->tkr_mono.xtime_nsec;
		/* tkr_raw.xtime_nsec == 0 */
		vdso_data->cs_mono_mult = tk->tkr_mono.mult;
		vdso_data->cs_raw_mult = tk->tkr_raw.mult;
		/* tkr_mono.shift == tkr_raw.shift */

+0 −1

Original line number	Diff line number	Diff line
		@@ -256,7 +256,6 @@ monotonic_raw:
		seqcnt_check fail=monotonic_raw

		/* All computations are done with left-shifted nsecs. */
		lsl x14, x14, x12
		get_nsec_per_sec res=x9
		lsl x9, x9, x12

+7 −4

Original line number	Diff line number	Diff line
		@@ -1411,10 +1411,8 @@ USE_TEXT_SECTION()
		.align 7
		do_hash_page:
		#ifdef CONFIG_PPC_STD_MMU_64
		andis. r0,r4,0xa410 /* weird error? */
		andis. r0,r4,0xa450 /* weird error? */
		bne- handle_page_fault /* if not, try to insert a HPTE */
		andis. r0,r4,DSISR_DABRMATCH@h
		bne- handle_dabr_fault
		CURRENT_THREAD_INFO(r11, r1)
		lwz r0,TI_PREEMPT(r11) /* If we're in an "NMI" */
		andis. r0,r0,NMI_MASK@h /* (i.e. an irq when soft-disabled) */
		@@ -1438,11 +1436,16 @@ do_hash_page:

		/* Error */
		blt- 13f

		/* Reload DSISR into r4 for the DABR check below */
		ld r4,_DSISR(r1)
		#endif /* CONFIG_PPC_STD_MMU_64 */

		/* Here we have a page fault that hash_page can't handle. */
		handle_page_fault:
		11: ld r4,_DAR(r1)
		11: andis. r0,r4,DSISR_DABRMATCH@h
		bne- handle_dabr_fault
		ld r4,_DAR(r1)
		ld r5,_DSISR(r1)
		addi r3,r1,STACK_FRAME_OVERHEAD
		bl do_page_fault

+11 −0

Original line number	Diff line number	Diff line
		@@ -511,6 +511,15 @@ int __kprobes setjmp_pre_handler(struct kprobe p, struct pt_regs regs)
		regs->gpr[2] = (unsigned long)(((func_descr_t *)jp->entry)->toc);
		#endif

		/*
		* jprobes use jprobe_return() which skips the normal return
		* path of the function, and this messes up the accounting of the
		* function graph tracer.
		*
		* Pause function graph tracing while performing the jprobe function.
		*/
		pause_graph_tracing();

		return 1;
		}

		@@ -533,6 +542,8 @@ int __kprobes longjmp_break_handler(struct kprobe p, struct pt_regs regs)
		* saved regs...
		*/
		memcpy(regs, &kcb->jprobe_saved_regs, sizeof(struct pt_regs));
		/* It's OK to start function graph tracing again */
		unpause_graph_tracing();
		preempt_enable_no_resched();
		return 1;
		}