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

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

Merge "ARM: dts: msm: switch off kpti on some targets"

parents ea78caf1 59866a5d

qcom/bengal.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ 
	};



	chosen {

		bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7";

		bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kpti=off";

	};



	soc: soc { };

qcom/kona.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ 
	};



	chosen {

		bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7";

		bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kpti=off";

	};



	firmware: firmware {

qcom/lagoon.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ 
	};



	chosen {

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

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

	};



	soc: soc { };

qcom/lito.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ 
	};



	chosen {

		bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7 earlycon=msm_geni_serial,0x888000";

		bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7 earlycon=msm_geni_serial,0x888000 kpti=off";

	};



	soc: soc { };

qcom/scuba.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ 
	};



	chosen {

		bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7";

		bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kpti=off";

	};



	soc: soc { };