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

Commit 0c987e84 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 0ccdef37 on remote branch 

Change-Id: I8b46ec0480e768ff25236564d15e68c5b238d049
parents 8a543db5 0ccdef37

AndroidKernel.mk

+18 −1
Original line number Diff line number Diff line
@@ -162,14 +162,31 @@ $(KERNEL_CONFIG): $(KERNEL_OUT) 
			echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_OUT)/.config; \

			$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) oldconfig; fi



$(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_OUT) $(KERNEL_HEADERS_INSTALL)

ifeq ($(TARGET_KERNEL_APPEND_DTB), true)

TARGET_PREBUILT_INT_KERNEL_IMAGE := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/Image

$(TARGET_PREBUILT_INT_KERNEL_IMAGE): $(KERNEL_USR)

$(TARGET_PREBUILT_INT_KERNEL_IMAGE): $(KERNEL_OUT) $(KERNEL_HEADERS_INSTALL)

	$(hide) echo "Building kernel modules..."

	$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_CFLAGS) Image

	$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_CFLAGS) modules

	$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) INSTALL_MOD_PATH=$(BUILD_ROOT_LOC)../$(KERNEL_MODULES_INSTALL) INSTALL_MOD_STRIP=1 $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) modules_install

	$(mv-modules)

	$(clean-module-folder)



$(TARGET_PREBUILT_INT_KERNEL): $(TARGET_PREBUILT_INT_KERNEL_IMAGE)

	$(hide) echo "Building kernel..."

	$(hide) rm -rf $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/dts

	$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_CFLAGS)

else

TARGET_PREBUILT_INT_KERNEL_IMAGE := $(TARGET_PREBUILT_INT_KERNEL)

$(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_OUT) $(KERNEL_HEADERS_INSTALL)

	$(hide) echo "Building kernel..."

	$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_CFLAGS)

	$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_CFLAGS) modules

	$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) INSTALL_MOD_PATH=$(BUILD_ROOT_LOC)../$(KERNEL_MODULES_INSTALL) INSTALL_MOD_STRIP=1 $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) modules_install

	$(mv-modules)

	$(clean-module-folder)

endif



$(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT)

	$(hide) if [ ! -z "$(KERNEL_HEADER_DEFCONFIG)" ]; then \

Documentation/ABI/testing/sysfs-class-net-qmi

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ Contact: Bjørn Mork <bjorn@mork.no> 
Description:

		Unsigned integer.



		Write a number ranging from 1 to 127 to add a qmap mux

		Write a number ranging from 1 to 254 to add a qmap mux

		based network device, supported by recent Qualcomm based

		modems.
@@ -46,5 +46,5 @@ Contact: Bjørn Mork <bjorn@mork.no> 
Description:

		Unsigned integer.



		Write a number ranging from 1 to 127 to delete a previously

		Write a number ranging from 1 to 254 to delete a previously

		created qmap mux based network device.

Documentation/admin-guide/hw-vuln/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -9,5 +9,6 @@ are configurable at compile, boot or run time. 
.. toctree::

   :maxdepth: 1



   spectre

   l1tf

   mds

Documentation/admin-guide/hw-vuln/spectre.rst

0 → 100644
+769 −0

File added.

Preview size limit exceeded, changes collapsed.

Documentation/admin-guide/kernel-parameters.txt

+4 −9
Original line number Diff line number Diff line
@@ -2522,6 +2522,7 @@ 
				Equivalent to: nopti [X86,PPC]

					       nospectre_v1 [PPC]

					       nobp=0 [S390]

					       nospectre_v1 [X86]

					       nospectre_v2 [X86,PPC,S390]

					       spectre_v2_user=off [X86]

					       spec_store_bypass_disable=off [X86,PPC]
@@ -2868,9 +2869,9 @@ 
			nosmt=force: Force disable SMT, cannot be undone

				     via the sysfs control file.



	nospectre_v1	[PPC] Disable mitigations for Spectre Variant 1 (bounds

			check bypass). With this option data leaks are possible

			in the system.

	nospectre_v1	[X66, PPC] Disable mitigations for Spectre Variant 1

			(bounds check bypass). With this option data leaks

			are possible in the system.



	nospectre_v2	[X86,PPC_FSL_BOOK3E] Disable all mitigations for the Spectre variant 2

			(indirect branch prediction) vulnerability. System may
@@ -4989,12 +4990,6 @@ 
			emulate     [default] Vsyscalls turn into traps and are

			            emulated reasonably safely.



			native      Vsyscalls are native syscall instructions.

			            This is a little bit faster than trapping

			            and makes a few dynamic recompilers work

			            better than they would in emulation mode.

			            It also makes exploits much easier to write.



			none        Vsyscalls don't work at all.  This makes

			            them quite hard to use for exploits but

			            might break your system.