hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/s390/kernel/Makefile
....@@ -10,20 +10,14 @@
1010
1111 # Do not trace early setup code
1212 CFLAGS_REMOVE_early.o = $(CC_FLAGS_FTRACE)
13
-CFLAGS_REMOVE_early_nobss.o = $(CC_FLAGS_FTRACE)
1413
1514 endif
1615
1716 GCOV_PROFILE_early.o := n
18
-GCOV_PROFILE_early_nobss.o := n
19
-
2017 KCOV_INSTRUMENT_early.o := n
21
-KCOV_INSTRUMENT_early_nobss.o := n
22
-
2318 UBSAN_SANITIZE_early.o := n
24
-UBSAN_SANITIZE_early_nobss.o := n
25
-
26
-KASAN_SANITIZE_early_nobss.o := n
19
+KASAN_SANITIZE_ipl.o := n
20
+KASAN_SANITIZE_machine_kexec.o := n
2721
2822 #
2923 # Passing null pointers is ok for smp code, since we access the lowcore here.
....@@ -37,19 +31,16 @@
3731 #
3832 CFLAGS_stacktrace.o += -fno-optimize-sibling-calls
3933 CFLAGS_dumpstack.o += -fno-optimize-sibling-calls
40
-
41
-#
42
-# Pass UTS_MACHINE for user_regset definition
43
-#
44
-CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"'
34
+CFLAGS_unwind_bc.o += -fno-optimize-sibling-calls
4535
4636 obj-y := traps.o time.o process.o base.o early.o setup.o idle.o vtime.o
4737 obj-y += processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o
48
-obj-y += debug.o irq.o ipl.o dis.o diag.o vdso.o early_nobss.o
38
+obj-y += debug.o irq.o ipl.o dis.o diag.o vdso.o
4939 obj-y += sysinfo.o lgr.o os_info.o machine_kexec.o pgm_check.o
5040 obj-y += runtime_instr.o cache.o fpu.o dumpstack.o guarded_storage.o sthyi.o
5141 obj-y += entry.o reipl.o relocate_kernel.o kdebugfs.o alternative.o
52
-obj-y += nospec-branch.o
42
+obj-y += nospec-branch.o ipl_vmparm.o machine_kexec_reloc.o unwind_bc.o
43
+obj-y += smp.o
5344
5445 extra-y += head64.o vmlinux.lds
5546
....@@ -57,16 +48,16 @@
5748 CFLAGS_REMOVE_nospec-branch.o += $(CC_FLAGS_EXPOLINE)
5849
5950 obj-$(CONFIG_MODULES) += module.o
60
-obj-$(CONFIG_SMP) += smp.o
6151 obj-$(CONFIG_SCHED_TOPOLOGY) += topology.o
62
-obj-$(CONFIG_HIBERNATION) += suspend.o swsusp.o
52
+obj-$(CONFIG_NUMA) += numa.o
6353 obj-$(CONFIG_AUDIT) += audit.o
6454 compat-obj-$(CONFIG_AUDIT) += compat_audit.o
6555 obj-$(CONFIG_COMPAT) += compat_linux.o compat_signal.o
66
-obj-$(CONFIG_COMPAT) += compat_wrapper.o $(compat-obj-y)
56
+obj-$(CONFIG_COMPAT) += $(compat-obj-y)
6757 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
6858 obj-$(CONFIG_STACKTRACE) += stacktrace.o
6959 obj-$(CONFIG_KPROBES) += kprobes.o
60
+obj-$(CONFIG_KPROBES) += kprobes_insn_page.o
7061 obj-$(CONFIG_FUNCTION_TRACER) += mcount.o ftrace.o
7162 obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
7263 obj-$(CONFIG_UPROBES) += uprobes.o
....@@ -75,14 +66,15 @@
7566 obj-$(CONFIG_KEXEC_FILE) += machine_kexec_file.o kexec_image.o
7667 obj-$(CONFIG_KEXEC_FILE) += kexec_elf.o
7768
78
-obj-$(CONFIG_PERF_EVENTS) += perf_event.o perf_cpum_cf.o perf_cpum_sf.o
69
+obj-$(CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT) += ima_arch.o
70
+
71
+obj-$(CONFIG_PERF_EVENTS) += perf_event.o perf_cpum_cf_common.o
72
+obj-$(CONFIG_PERF_EVENTS) += perf_cpum_cf.o perf_cpum_sf.o
7973 obj-$(CONFIG_PERF_EVENTS) += perf_cpum_cf_events.o perf_regs.o
74
+obj-$(CONFIG_PERF_EVENTS) += perf_cpum_cf_diag.o
8075
8176 obj-$(CONFIG_TRACEPOINTS) += trace.o
77
+obj-$(findstring y, $(CONFIG_PROTECTED_VIRTUALIZATION_GUEST) $(CONFIG_PGSTE)) += uv.o
8278
8379 # vdso
8480 obj-y += vdso64/
85
-obj-$(CONFIG_COMPAT) += vdso32/
86
-
87
-chkbss := head64.o early_nobss.o
88
-include $(srctree)/arch/s390/scripts/Makefile.chkbss