Merge pull request #17 from bananafunction/lineage-17.1 (38965cb3) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/sysctl/kernel.txt

+21 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@ show up in /proc/sys/kernel:
		- sysctl_writes_strict
		- tainted
		- threads-max
		- unprivileged_bpf_disabled
		- unknown_nmi_panic
		- watchdog
		- watchdog_thresh
		@@ -944,6 +945,26 @@ available RAM pages threads-max is reduced accordingly.

		==============================================================

		unprivileged_bpf_disabled:

		Writing 1 to this entry will disable unprivileged calls to bpf();
		once disabled, calling bpf() without CAP_SYS_ADMIN will return
		-EPERM. Once set to 1, this can't be cleared from the running kernel
		anymore.

		Writing 2 to this entry will also disable unprivileged calls to bpf(),
		however, an admin can still change this setting later on, if needed, by
		writing 0 or 1 to this entry.

		If BPF_UNPRIV_DEFAULT_OFF is enabled in the kernel config, then this
		entry will default to 2 instead of 0.

		0 - Unprivileged calls to bpf() are enabled
		1 - Unprivileged calls to bpf() are disabled without recovery
		2 - Unprivileged calls to bpf() are disabled

		==============================================================

		unknown_nmi_panic:

		The value in this file affects behavior of handling NMI. When the

arch/arm/boot/dts/imx23-evk.dts

+0 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,6 @@
		MX23_PAD_LCD_RESET__GPIO_1_18
		MX23_PAD_PWM3__GPIO_1_29
		MX23_PAD_PWM4__GPIO_1_30
		MX23_PAD_SSP1_DETECT__SSP1_DETECT
		>;
		fsl,drive-strength = <MXS_DRIVE_4mA>;
		fsl,voltage = <MXS_VOLTAGE_HIGH>;

arch/arm/boot/dts/imx6qdl-udoo.dtsi

+4 −1

Original line number	Diff line number	Diff line
		@@ -9,6 +9,8 @@
		*
		*/

		#include <dt-bindings/gpio/gpio.h>

		/ {
		chosen {
		stdout-path = &uart2;
		@@ -107,6 +109,7 @@
		MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
		MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
		MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
		MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x1b0b0
		>;
		};
		};
		@@ -129,6 +132,6 @@
		&usdhc3 {
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_usdhc3>;
		non-removable;
		cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
		status = "okay";
		};

arch/arm/mm/mmu.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -228,12 +228,14 @@ early_param("ecc", early_ecc);
		static int __init early_cachepolicy(char *p)
		{
		pr_warn("cachepolicy kernel parameter not supported without cp15\n");
		return 0;
		}
		early_param("cachepolicy", early_cachepolicy);

		static int __init noalign_setup(char *__unused)
		{
		pr_warn("noalign kernel parameter not supported without cp15\n");
		return 1;
		}
		__setup("noalign", noalign_setup);

arch/parisc/kernel/unaligned.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -354,7 +354,7 @@ static int emulate_stw(struct pt_regs *regs, int frreg, int flop)
		: "r" (val), "r" (regs->ior), "r" (regs->isr)
		: "r19", "r20", "r21", "r22", "r1", FIXUP_BRANCH_CLOBBER );

		return 0;
		return ret;
		}
		static int emulate_std(struct pt_regs *regs, int frreg, int flop)
		{
		@@ -411,7 +411,7 @@ static int emulate_std(struct pt_regs *regs, int frreg, int flop)
		__asm__ __volatile__ (
		" mtsp %4, %%sr1\n"
		" zdep %2, 29, 2, %%r19\n"
		" dep %%r0, 31, 2, %2\n"
		" dep %%r0, 31, 2, %3\n"
		" mtsar %%r19\n"
		" zvdepi -2, 32, %%r19\n"
		"1: ldw 0(%%sr1,%3),%%r20\n"
		@@ -423,7 +423,7 @@ static int emulate_std(struct pt_regs *regs, int frreg, int flop)
		" andcm %%r21, %%r19, %%r21\n"
		" or %1, %%r20, %1\n"
		" or %2, %%r21, %2\n"
		"3: stw %1,0(%%sr1,%1)\n"
		"3: stw %1,0(%%sr1,%3)\n"
		"4: stw %%r1,4(%%sr1,%3)\n"
		"5: stw %2,8(%%sr1,%3)\n"
		" copy %%r0, %0\n"
		@@ -611,7 +611,6 @@ void handle_unaligned(struct pt_regs *regs)
		ret = ERR_NOTHANDLED; /* "undefined", but lets kill them. */
		break;
		}
		#ifdef CONFIG_PA20
		switch (regs->iir & OPCODE2_MASK)
		{
		case OPCODE_FLDD_L:
		@@ -622,22 +621,23 @@ void handle_unaligned(struct pt_regs *regs)
		flop=1;
		ret = emulate_std(regs, R2(regs->iir),1);
		break;
		#ifdef CONFIG_PA20
		case OPCODE_LDD_L:
		ret = emulate_ldd(regs, R2(regs->iir),0);
		break;
		case OPCODE_STD_L:
		ret = emulate_std(regs, R2(regs->iir),0);
		break;
		}
		#endif
		}
		switch (regs->iir & OPCODE3_MASK)
		{
		case OPCODE_FLDW_L:
		flop=1;
		ret = emulate_ldw(regs, R2(regs->iir),0);
		ret = emulate_ldw(regs, R2(regs->iir), 1);
		break;
		case OPCODE_LDW_M:
		ret = emulate_ldw(regs, R2(regs->iir),1);
		ret = emulate_ldw(regs, R2(regs->iir), 0);
		break;

		case OPCODE_FSTW_L: