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

Commit d03f522a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: enable kpti on msm8996 and msm8996pro"

parents 6844af58 5ce51356

arch/arm/boot/dts/qcom/msm8996.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
	interrupt-parent = <&intc>;



	chosen {

		bootargs = "fpsimd.fpsimd_settings=1 app_setting.use_app_setting=1 app_setting.use_32bit_app_setting=1";

		bootargs = "fpsimd.fpsimd_settings=1 app_setting.use_app_setting=1 app_setting.use_32bit_app_setting=1 kpti=1";

	};



	aliases {

arch/arm/boot/dts/qcom/msm8996pro.dtsi

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -22,7 +22,7 @@ 
	qcom,msm-id = <305 0x10000>;



	chosen {

		bootargs = "lpm_levels.sleep_disabled=1 fpsimd.fpsimd_settings=1 app_setting.use_app_setting=0 app_setting.use_32bit_app_setting_pro=1";

		bootargs = "lpm_levels.sleep_disabled=1 fpsimd.fpsimd_settings=1 app_setting.use_app_setting=0 app_setting.use_32bit_app_setting_pro=1 kpti=1";

	};

};