Merge pull request #30 from derfelot/lineage-18.1_update (b9ef0af7) · Commits · e / devices / android_kernel_sony_msm8998

Makefile

+2 −3

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 4
		SUBLEVEL = 269
		SUBLEVEL = 275
		EXTRAVERSION =
		NAME = Blurry Fish Butt

		@@ -743,12 +743,11 @@ KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)
		# See modpost pattern 2
		KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)
		KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)
		else
		endif

		# These warnings generated too much noise in a regular build.
		# Use make W=1 to enable them (see scripts/Makefile.extrawarn)
		KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)
		endif

		KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)
		ifdef CONFIG_FRAME_POINTER

+9 −7

Original line number	Diff line number	Diff line
		@@ -488,9 +488,11 @@ void notrace cpu_init(void)
		* In Thumb-2, msr with an immediate value is not allowed.
		*/
		#ifdef CONFIG_THUMB2_KERNEL
		#define PLC "r"
		#define PLC_l "l"
		#define PLC_r "r"
		#else
		#define PLC "I"
		#define PLC_l "I"
		#define PLC_r "I"
		#endif

		/*
		@@ -512,15 +514,15 @@ void notrace cpu_init(void)
		"msr cpsr_c, %9"
		:
		: "r" (stk),
		PLC (PSR_F_BIT \| PSR_I_BIT \| IRQ_MODE),
		PLC_r (PSR_F_BIT \| PSR_I_BIT \| IRQ_MODE),
		"I" (offsetof(struct stack, irq[0])),
		PLC (PSR_F_BIT \| PSR_I_BIT \| ABT_MODE),
		PLC_r (PSR_F_BIT \| PSR_I_BIT \| ABT_MODE),
		"I" (offsetof(struct stack, abt[0])),
		PLC (PSR_F_BIT \| PSR_I_BIT \| UND_MODE),
		PLC_r (PSR_F_BIT \| PSR_I_BIT \| UND_MODE),
		"I" (offsetof(struct stack, und[0])),
		PLC (PSR_F_BIT \| PSR_I_BIT \| FIQ_MODE),
		PLC_r (PSR_F_BIT \| PSR_I_BIT \| FIQ_MODE),
		"I" (offsetof(struct stack, fiq[0])),
		PLC (PSR_F_BIT \| PSR_I_BIT \| SVC_MODE)
		PLC_l (PSR_F_BIT \| PSR_I_BIT \| SVC_MODE)
		: "r14");
		#endif
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -328,6 +328,7 @@ static int n8x0_mmc_get_cover_state(struct device *dev, int slot)

		static void n8x0_mmc_callback(void *data, u8 card_mask)
		{
		#ifdef CONFIG_MMC_OMAP
		int bit, *openp, index;

		if (board_is_n800()) {
		@@ -345,7 +346,6 @@ static void n8x0_mmc_callback(void *data, u8 card_mask)
		else
		*openp = 0;

		#ifdef CONFIG_MMC_OMAP
		omap_mmc_notify_cover_event(mmc_device, index, *openp);
		#else
		pr_warn("MMC: notify cover event not available\n");

+6 −0

Original line number	Diff line number	Diff line
		@@ -270,6 +270,7 @@ void __kprobes kprobe_handler(struct pt_regs *regs)
		switch (kcb->kprobe_status) {
		case KPROBE_HIT_ACTIVE:
		case KPROBE_HIT_SSDONE:
		case KPROBE_HIT_SS:
		/* A pre- or post-handler probe got us here. */
		kprobes_inc_nmissed_count(p);
		save_previous_kprobe(kcb);
		@@ -278,6 +279,11 @@ void __kprobes kprobe_handler(struct pt_regs *regs)
		singlestep(p, regs, kcb);
		restore_previous_kprobe(kcb);
		break;
		case KPROBE_REENTER:
		/* A nested probe was hit in FIQ, it is a BUG */
		pr_warn("Unrecoverable kprobe detected at %p.\n",
		p->addr);
		/* fall through */
		default:
		/* impossible cases */
		BUG();

+0 −8

Original line number	Diff line number	Diff line
		@@ -495,14 +495,6 @@ asmlinkage long do_ni_syscall(struct pt_regs *regs)
		}
		#endif

		if (show_unhandled_signals_ratelimited()) {
		pr_info("%s[%d]: syscall %d\n", current->comm,
		task_pid_nr(current), (int)regs->syscallno);
		dump_instr("", regs);
		if (user_mode(regs))
		__show_regs(regs);
		}

		return sys_ni_syscall();
		}