diff options
| author | qctecmdr <qctecmdr@localhost> | 2020-09-23 07:52:54 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2020-09-23 07:52:54 -0700 |
| commit | 57787bc7b36dd89b95534b6eece9fbea593306df (patch) | |
| tree | e58831db2b0d3f9fdc6ba3361253d8bb2a14e16a | |
| parent | ea78caf15f2a1d550be53a9d1ec78db4f2b56edb (diff) | |
| parent | 59866a5d3d4e40ce881dcd571b153a027b007a42 (diff) | |
| download | devicetree-57787bc7b36dd89b95534b6eece9fbea593306df.tar.gz | |
Merge "ARM: dts: msm: switch off kpti on some targets"
| -rw-r--r-- | qcom/bengal.dtsi | 2 | ||||
| -rw-r--r-- | qcom/kona.dtsi | 2 | ||||
| -rw-r--r-- | qcom/lagoon.dtsi | 2 | ||||
| -rw-r--r-- | qcom/lito.dtsi | 2 | ||||
| -rw-r--r-- | qcom/scuba.dtsi | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/qcom/bengal.dtsi b/qcom/bengal.dtsi index de1c325f..45041632 100644 --- a/qcom/bengal.dtsi +++ b/qcom/bengal.dtsi @@ -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 { }; diff --git a/qcom/kona.dtsi b/qcom/kona.dtsi index e39627b5..6aeb3660 100644 --- a/qcom/kona.dtsi +++ b/qcom/kona.dtsi @@ -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 { diff --git a/qcom/lagoon.dtsi b/qcom/lagoon.dtsi index 416d88c4..b13324d1 100644 --- a/qcom/lagoon.dtsi +++ b/qcom/lagoon.dtsi @@ -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 { }; diff --git a/qcom/lito.dtsi b/qcom/lito.dtsi index 3c95d866..238902bb 100644 --- a/qcom/lito.dtsi +++ b/qcom/lito.dtsi @@ -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 { }; diff --git a/qcom/scuba.dtsi b/qcom/scuba.dtsi index 99ad5e0b..f1857653 100644 --- a/qcom/scuba.dtsi +++ b/qcom/scuba.dtsi @@ -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 { }; |