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

Commit 37e48863 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: switch off kpti on shima/lahaina/yupik"

parents 99d10c01 5dabbf54

qcom/lahaina.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
	#size-cells = <2>;



	chosen {

		bootargs = "log_buf_len=256K earlycon=msm_geni_serial,0x98c000 rcupdate.rcu_expedited=1 rcu_nocbs=0-7";

		bootargs = "log_buf_len=256K earlycon=msm_geni_serial,0x98c000 rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kpti=off";

	};



	memory { device_type = "memory"; reg = <0 0 0 0>; };

qcom/shima.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
	#size-cells = <2>;



	chosen {

		bootargs = "log_buf_len=256K earlycon=msm_geni_serial,0x994000 rcupdate.rcu_expedited=1 rcu_nocbs=0-7";

		bootargs = "log_buf_len=256K earlycon=msm_geni_serial,0x994000 rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kpti=off";

	};



	memory { device_type = "memory"; reg = <0 0 0 0>; };

qcom/yupik.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ 
	soc: soc { };



	chosen {

		bootargs = "log_buf_len=256K earlycon=msm_geni_serial,0x994000 rcupdate.rcu_expedited=1 rcu_nocbs=0-7";

		bootargs = "log_buf_len=256K earlycon=msm_geni_serial,0x994000 rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kpti=off";

	};

};