kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/x86/lib/Makefile
..
..
@@ -6,22 +6,31 @@
6
6
 # Produces uninteresting flaky coverage.
7
7
 KCOV_INSTRUMENT_delay.o	:= n
8
8
 
9
+# KCSAN uses udelay for introducing watchpoint delay; avoid recursion.
10
+KCSAN_SANITIZE_delay.o := n
11
+ifdef CONFIG_KCSAN
12
+# In case KCSAN+lockdep+ftrace are enabled, disable ftrace for delay.o to avoid
13
+# lockdep -> [other libs] -> KCSAN -> udelay -> ftrace -> lockdep recursion.
14
+CFLAGS_REMOVE_delay.o = $(CC_FLAGS_FTRACE)
15
+endif
16
+
9
17
 # Early boot use of cmdline; don't instrument it
10
18
 ifdef CONFIG_AMD_MEM_ENCRYPT
11
19
 KCOV_INSTRUMENT_cmdline.o := n
12
20
 KASAN_SANITIZE_cmdline.o  := n
21
+KCSAN_SANITIZE_cmdline.o  := n
13
22
 
14
23
 ifdef CONFIG_FUNCTION_TRACER
15
24
 CFLAGS_REMOVE_cmdline.o = -pg
16
25
 endif
17
26
 
18
-CFLAGS_cmdline.o := $(call cc-option, -fno-stack-protector)
27
+CFLAGS_cmdline.o := -fno-stack-protector -fno-jump-tables
19
28
 endif
20
29
 
21
30
 inat_tables_script = $(srctree)/arch/x86/tools/gen-insn-attr-x86.awk
22
31
 inat_tables_maps = $(srctree)/arch/x86/lib/x86-opcode-map.txt
23
32
 quiet_cmd_inat_tables = GEN     $@
24
-      cmd_inat_tables = $(AWK) -f $(inat_tables_script) $(inat_tables_maps) > $@ || rm -f $@
33
+      cmd_inat_tables = $(AWK) -f $(inat_tables_script) $(inat_tables_maps) > $@
25
34
 
26
35
 $(obj)/inat-tables.c: $(inat_tables_script) $(inat_tables_maps)
27
36
 	$(call cmd,inat_tables)
..
..
@@ -35,13 +44,14 @@
35
44
 lib-y := delay.o misc.o cmdline.o cpu.o
36
45
 lib-y += usercopy_$(BITS).o usercopy.o getuser.o putuser.o
37
46
 lib-y += memcpy_$(BITS).o
38
-lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o
47
+lib-$(CONFIG_ARCH_HAS_COPY_MC) += copy_mc.o copy_mc_64.o
39
48
 lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o insn-eval.o
40
49
 lib-$(CONFIG_RANDOMIZE_BASE) += kaslr.o
41
50
 lib-$(CONFIG_FUNCTION_ERROR_INJECTION)	+= error-inject.o
42
51
 lib-$(CONFIG_RETPOLINE) += retpoline.o
43
52
 
44
53
 obj-y += msr.o msr-reg.o msr-reg-export.o hweight.o
54
+obj-y += iomem.o
45
55
 
46
56
 ifeq ($(CONFIG_X86_32),y)
47
57
         obj-y += atomic64_32.o