1diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig 2index 84d2b773e..a297d20c3 100644 3--- a/arch/arm64/Kconfig 4+++ b/arch/arm64/Kconfig 5@@ -1878,7 +1878,7 @@ config CC_HAVE_STACKPROTECTOR_SYSREG 6 def_bool $(cc-option,-mstack-protector-guard=sysreg -mstack-protector-guard-reg=sp_el0 -mstack-protector-guard-offset=0) 7 8 config STACKPROTECTOR_PER_TASK 9- def_bool y 10+ def_bool n 11 depends on STACKPROTECTOR && CC_HAVE_STACKPROTECTOR_SYSREG 12 13 endmenu 14diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile 15index 485b7dbd4..d79c30baf 100644 16--- a/arch/arm64/Makefile 17+++ b/arch/arm64/Makefile 18@@ -198,3 +198,18 @@ define archhelp 19 echo ' (distribution) /sbin/installkernel or' 20 echo ' install to $$(INSTALL_PATH) and run lilo' 21 endef 22+ 23+MAKE_MODULES ?= y 24+ 25+%.img: 26+ifeq ("$(CONFIG_MODULES)$(MAKE_MODULES)$(srctree)","yy$(objtree)") 27+ $(Q)$(MAKE) rockchip/$*.dtb Image.lz4 modules 28+else 29+ $(Q)$(MAKE) rockchip/$*.dtb Image.lz4 30+endif 31+ $(Q)$(KERNEL_SOURCE_PATH)/mvkfile --mv $(vendortree)/rockchip $(objdtstree) $*.dtb .$*.dtb* 32+ $(Q)$(KERNEL_SOURCE_PATH)/mvkfile --mv $(KERNEL_SOURCE_PATH)/scripts $(KBUILD_OUTPUT)/scripts resource_tool .resource_tool.cmd 33+ $(Q)$(KERNEL_SOURCE_PATH)/scripts/mkimg --dtb $*.dtb 34+ 35+CLEAN_DIRS += out 36+CLEAN_FILES += boot.img kernel.img resource.img zboot.img 37diff --git a/arch/arm64/include/asm/system_info.h b/arch/arm64/include/asm/system_info.h 38new file mode 100644 39index 000000000..a82fe791b 40--- /dev/null 41+++ b/arch/arm64/include/asm/system_info.h 42@@ -0,0 +1,14 @@ 43+/* SPDX-License-Identifier: GPL-2.0 */ 44+#ifndef __ASM_ARM_SYSTEM_INFO_H 45+#define __ASM_ARM_SYSTEM_INFO_H 46+ 47+#ifndef __ASSEMBLY__ 48+ 49+/* information about the system we're running on */ 50+extern unsigned int system_rev; 51+extern unsigned int system_serial_low; 52+extern unsigned int system_serial_high; 53+ 54+#endif /* !__ASSEMBLY__ */ 55+ 56+#endif /* __ASM_ARM_SYSTEM_INFO_H */ 57diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c 58index 61204ba07..e0e2d919c 100644 59--- a/arch/arm64/kernel/cpuinfo.c 60+++ b/arch/arm64/kernel/cpuinfo.c 61@@ -25,6 +25,12 @@ 62 #include <linux/smp.h> 63 #include <linux/delay.h> 64 65+unsigned int system_serial_low; 66+EXPORT_SYMBOL(system_serial_low); 67+ 68+unsigned int system_serial_high; 69+EXPORT_SYMBOL(system_serial_high); 70+ 71 /* 72 * In case the boot CPU is hotpluggable, we record its initial state and 73 * current state separately. Certain system registers may contain different 74diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c 75index 4999caff3..b47d477f4 100644 76--- a/arch/arm64/kernel/process.c 77+++ b/arch/arm64/kernel/process.c 78@@ -191,6 +191,8 @@ void machine_restart(char *cmd) 79 local_irq_disable(); 80 smp_send_stop(); 81 82+ do_kernel_pre_restart(cmd); 83+ 84 /* 85 * UpdateCapsule() depends on the system being reset via 86 * ResetSystem(). 87