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

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

Merge "ion: disable system contig heap"

parents 5973304e 3c45e99c

arch/arm/boot/dts/qcom/msm8909-ion.dtsi

+0 −5
Original line number Diff line number Diff line
@@ -21,11 +21,6 @@ 
			qcom,ion-heap-type = "SYSTEM";

		};



		qcom,ion-heap@21 {

			reg = <21>;

			qcom,ion-heap-type = "SYSTEM_CONTIG";

		};



		qcom,ion-heap@27 { /* QSEECOM HEAP */

			reg = <27>;

			memory-region = <&venus_qseecom_mem>;

arch/arm/boot/dts/qcom/msm8917-ion.dtsi

+1 −6
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, 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,11 +22,6 @@ 
			qcom,ion-heap-type = "SYSTEM";

		};



		qcom,ion-heap@21 {

			reg = <21>;

			qcom,ion-heap-type = "SYSTEM_CONTIG";

		};



		qcom,ion-heap@8 { /* CP_MM HEAP */

			reg = <8>;

			memory-region = <&secure_mem>;

arch/arm/boot/dts/qcom/msm8937-ion.dtsi

+1 −6
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, 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,11 +22,6 @@ 
			qcom,ion-heap-type = "SYSTEM";

		};



		qcom,ion-heap@21 {

			reg = <21>;

			qcom,ion-heap-type = "SYSTEM_CONTIG";

		};



		qcom,ion-heap@8 { /* CP_MM HEAP */

			reg = <8>;

			memory-region = <&secure_mem>;

arch/arm/boot/dts/qcom/msm8952-ion.dtsi

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

/* Copyright (c) 2014-2016, 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
@@ -21,11 +21,6 @@ 
			qcom,ion-heap-type = "SYSTEM";

		};



		qcom,ion-heap@21 {

			reg = <21>;

			qcom,ion-heap-type = "SYSTEM_CONTIG";

		};



		qcom,ion-heap@8 { /* CP_MM HEAP */

			reg = <8>;

			memory-region = <&secure_mem>;

arch/arm/boot/dts/qcom/msm8953-ion.dtsi

+0 −5
Original line number Diff line number Diff line
@@ -21,11 +21,6 @@ 
			qcom,ion-heap-type = "SYSTEM";

		};



		qcom,ion-heap@21 {

			reg = <21>;

			qcom,ion-heap-type = "SYSTEM_CONTIG";

		};



		qcom,ion-heap@8 { /* CP_MM HEAP */

			reg = <8>;

			memory-region = <&secure_mem>;