Merge "ARM: dts: msm: switch off kpti on some targets"
This commit is contained in:
commit
57787bc7b3
5 files changed
+5
-5
No files matched your search
+1
-1
@@ -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 { };
|
||||
|
||||
+1
-1
@@ -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 {
|
||||
|
||||
+1
-1
@@ -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 { };
|
||||
|
||||
+1
-1
@@ -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 { };
|
||||
|
||||
+1
-1
@@ -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 { };
|
||||
|
||||
Reference in new issue
Block a user