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

Commit 39b2e1bf authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge commit '4e009b46' from AU122 into msm-4.14"

parents 777ed004 e1593cda

AndroidKernel.mk

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ TARGET_KERNEL_CROSS_COMPILE_PREFIX := $(strip $(TARGET_KERNEL_CROSS_COMPILE_PREF 
ifeq ($(TARGET_KERNEL_CROSS_COMPILE_PREFIX),)

KERNEL_CROSS_COMPILE := arm-eabi-

else

KERNEL_CROSS_COMPILE := $(shell pwd)/$(TARGET_TOOLS_PREFIX)

KERNEL_CROSS_COMPILE := $(TARGET_KERNEL_CROSS_COMPILE_PREFIX)

endif



ifeq ($(KERNEL_LLVM_SUPPORT), true)

Documentation/admin-guide/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -1974,6 +1974,9 @@ 
			off

				Disables hypervisor mitigations and doesn't

				emit any warnings.

				It also drops the swap size and available

				RAM limit restriction on both hypervisor and

				bare metal.



			Default is 'flush'.

Documentation/admin-guide/l1tf.rst

+5 −1
Original line number Diff line number Diff line
@@ -405,6 +405,9 @@ time with the option "l1tf=". The valid arguments for this option are: 


  off		Disables hypervisor mitigations and doesn't emit any

		warnings.

		It also drops the swap size and available RAM limit restrictions

		on both hypervisor and bare metal.



  ============  =============================================================



The default is 'flush'. For details about L1D flushing see :ref:`l1d_flush`.
@@ -576,7 +579,8 @@ Default mitigations 
  The kernel default mitigations for vulnerable processors are:



  - PTE inversion to protect against malicious user space. This is done

    unconditionally and cannot be controlled.

    unconditionally and cannot be controlled. The swap storage is limited

    to ~16TB.



  - L1D conditional flushing on VMENTER when EPT is enabled for

    a guest.

Documentation/devicetree/bindings/arm/msm/msm.txt

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ compatible = "qcom,sdmmagpie-idp" 
compatible = "qcom,sdmmagpie-atp"

compatible = "qcom,sdmmagpie-qrd"

compatible = "qcom,sdmmagpiep-idp"

compatible = "qcom,sdmmagpiep-atp"

compatible = "qcom,sdmmagpiep"

compatible = "qcom,sdmmagpiep-qrd"

compatible = "qcom,trinket-rumi"

Documentation/devicetree/bindings/arm/msm/qcom,osm.txt

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ Properties: 
	Value type: <string>

	Definition: must be "qcom,clk-cpu-osm" or "qcom,clk-cpu-osm-sdmshrike"

			or "qcom,clk-cpu-osm-sm6150" or

			"qcom,clk-cpu-osm-sdmmagpie".

			"qcom,clk-cpu-osm-sdmmagpie" or

			"qcom,clk-cpu-osm-trinket".



- reg

	Usage:      required