xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'x86/kdump' into locking/kcsan, to resolve conflicts

Browse Source 
Conflicts:
	arch/x86/purgatory/Makefile

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2020-03-21 09:23:40 +01:00
parent 7add7875a8 e4160b2e4b
commit a4654e9bde
11029 changed files with 541298 additions and 230990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/realmode/rm/Makefile
View File

@@ -15,7 +15,7 @@ OBJECT_FILES_NON_STANDARD := y
# Prevents link failures: __sanitizer_cov_trace_pc() is not linked in.
KCOV_INSTRUMENT := n
always := realmode.bin realmode.relocs
always-y := realmode.bin realmode.relocs
wakeup-objs := wakeup_asm.o wakemain.o video-mode.o
wakeup-objs += copy.o bioscall.o regs.o