update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/tools/perf/tests/make
..
..
@@ -28,9 +28,13 @@
28
28
 
29
29
 PARALLEL_OPT=
30
30
 ifeq ($(SET_PARALLEL),1)
31
-  cores := $(shell (getconf _NPROCESSORS_ONLN || egrep -c '^processor|^CPU[0-9]' /proc/cpuinfo) 2>/dev/null)
32
-  ifeq ($(cores),0)
33
-    cores := 1
31
+  ifeq ($(JOBS),)
32
+    cores := $(shell (getconf _NPROCESSORS_ONLN || egrep -c '^processor|^CPU[0-9]' /proc/cpuinfo) 2>/dev/null)
33
+    ifeq ($(cores),0)
34
+      cores := 1
35
+    endif
36
+  else
37
+    cores=$(JOBS)
34
38
   endif
35
39
   PARALLEL_OPT="-j$(cores)"
36
40
 endif
..
..
@@ -80,10 +84,14 @@
80
84
 make_no_libbionic   := NO_LIBBIONIC=1
81
85
 make_no_auxtrace    := NO_AUXTRACE=1
82
86
 make_no_libbpf	    := NO_LIBBPF=1
87
+make_no_libbpf_DEBUG := NO_LIBBPF=1 DEBUG=1
83
88
 make_no_libcrypto   := NO_LIBCRYPTO=1
84
89
 make_with_babeltrace:= LIBBABELTRACE=1
85
90
 make_no_sdt	    := NO_SDT=1
91
+make_no_syscall_tbl := NO_SYSCALL_TABLE=1
86
92
 make_with_clangllvm := LIBCLANGLLVM=1
93
+make_with_libpfm4   := LIBPFM4=1
94
+make_with_gtk2      := GTK2=1
87
95
 make_tags           := tags
88
96
 make_cscope         := cscope
89
97
 make_help           := help
..
..
@@ -100,14 +108,15 @@
100
108
 make_install_pdf    := install-pdf
101
109
 make_install_prefix       := install prefix=/tmp/krava
102
110
 make_install_prefix_slash := install prefix=/tmp/krava/
103
-make_static         := LDFLAGS=-static
111
+make_static         := LDFLAGS=-static NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 NO_JVMTI=1
104
112
 
105
113
 # all the NO_* variable combined
106
114
 make_minimal        := NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1
107
115
 make_minimal        += NO_DEMANGLE=1 NO_LIBELF=1 NO_LIBUNWIND=1 NO_BACKTRACE=1
108
116
 make_minimal        += NO_LIBNUMA=1 NO_LIBAUDIT=1 NO_LIBBIONIC=1
109
117
 make_minimal        += NO_LIBDW_DWARF_UNWIND=1 NO_AUXTRACE=1 NO_LIBBPF=1
110
-make_minimal        += NO_LIBCRYPTO=1 NO_SDT=1 NO_JVMTI=1
118
+make_minimal        += NO_LIBCRYPTO=1 NO_SDT=1 NO_JVMTI=1 NO_LIBZSTD=1
119
+make_minimal        += NO_LIBCAP=1 NO_SYSCALL_TABLE=1
111
120
 
112
121
 # $(run) contains all available tests
113
122
 run := make_pure
..
..
@@ -139,8 +148,14 @@
139
148
 run += make_no_libbionic
140
149
 run += make_no_auxtrace
141
150
 run += make_no_libbpf
151
+run += make_no_libbpf_DEBUG
152
+run += make_no_libcrypto
153
+run += make_no_sdt
154
+run += make_no_syscall_tbl
142
155
 run += make_with_babeltrace
143
156
 run += make_with_clangllvm
157
+run += make_with_libpfm4
158
+run += make_with_gtk2
144
159
 run += make_help
145
160
 run += make_doc
146
161
 run += make_perf_o
..
..
@@ -326,6 +341,10 @@
326
341
 	(make -C ../../tools $(PARALLEL_OPT) $(K_O_OPT) perf) > $@ 2>&1 && \
327
342
 	test -x $(KERNEL_O)/tools/perf/perf && rm -f $@ || (cat $@ ; false)
328
343
 
344
+make_libperf:
345
+	@echo "- make -C lib";
346
+	make -C lib clean >$@ 2>&1; make -C lib >>$@ 2>&1 && rm $@
347
+
329
348
 FEATURES_DUMP_FILE := $(FULL_O)/BUILD_TEST_FEATURE_DUMP
330
349
 FEATURES_DUMP_FILE_STATIC := $(FULL_O)/BUILD_TEST_FEATURE_DUMP_STATIC
331
350
 
..
..
@@ -364,5 +383,5 @@
364
383
 			$(eval $(t) := $($(t)) FEATURES_DUMP=$(FEATURES_DUMP_FILE))))
365
384
 endif
366
385
 
367
-.PHONY: all $(run) $(run_O) tarpkg clean make_kernelsrc make_kernelsrc_tools
386
+.PHONY: all $(run) $(run_O) tarpkg clean make_kernelsrc make_kernelsrc_tools make_libperf
368
387
 endif # ifndef MK