lael-labs/linux

.gitignore+1−0

@@ -52,6 +52,7 @@ · 51 unmodified lines
52	*.xz	52	*.xz
53	*.zst	53	*.zst
54	Module.symvers	54	Module.symvers
		55	dtbs-list
55	modules.order	56	modules.order
56		57
57	#	58	#

Documentation/kbuild/kconfig-language.rst+1−5

 choices::
-	"choice" [symbol]
+	"choice"
 	<choice options>
 	<choice block>
 	"endchoice"
 A choice accepts another option "optional", which allows to set the
 choice to 'n' and no entry needs to be selected.
-If no [symbol] is associated with a choice, then you can not have multiple
-definitions of that choice. If a [symbol] is associated to the choice,
-then you may define the same choice (i.e. with the same entries) in another
-place.
 comment::

Documentation/kbuild/kconfig.rst+166−197

@@ -1,10 +1,10 @@
1	===================	1	=================================
2	Kconfig make config	2	Configuration targets and editors
3	===================	3	=================================
4		4
5	This file contains some assistance for using `make *config`.	5	This file contains some assistance for using ``make *config``.
6		6
7	Use "make help" to list all of the possible configuration targets.	7	Use ``make help`` to list all of the possible configuration targets.
8		8
9	The xconfig ('qconf'), menuconfig ('mconf'), and nconfig ('nconf')	9	The xconfig ('qconf'), menuconfig ('mconf'), and nconfig ('nconf')
10	programs also have embedded help text. Be sure to check that for	10	programs also have embedded help text. Be sure to check that for
@@ -12,8 +12,9 @@ navigation, search, and other general help text. · 1 unmodified line
12		12
13	The gconfig ('gconf') program has limited help text.	13	The gconfig ('gconf') program has limited help text.
14		14
		15
15	General	16	General
16	-------	17	=======
17		18
18	New kernel releases often introduce new config symbols. Often more	19	New kernel releases often introduce new config symbols. Often more
19	important, new kernel releases may rename config symbols. When	20	important, new kernel releases may rename config symbols. When
@@ -24,118 +25,102 @@ symbols have been introduced. · 4 unmodified lines
24		25
25	To see a list of new config symbols, use::	26	To see a list of new config symbols, use::
26		27
27	cp user/some/old.config .config	28	cp user/some/old.config .config
28	make listnewconfig	29	make listnewconfig
29		30
30	and the config program will list any new symbols, one per line.	31	and the config program will list any new symbols, one per line.
31		32
32	Alternatively, you can use the brute force method::	33	Alternatively, you can use the brute force method::
33		34
34	make oldconfig	35	make oldconfig
35	scripts/diffconfig .config.old .config \| less	36	scripts/diffconfig .config.old .config \| less
36
37	----------------------------------------------------------------------
38
39	Environment variables for `*config`
40		37
41	KCONFIG_CONFIG
42	--------------
43	This environment variable can be used to specify a default kernel config
44	file name to override the default name of ".config".
45		38
46	KCONFIG_DEFCONFIG_LIST	39	Environment variables
47	----------------------	40	=====================
48		41
49	This environment variable specifies a list of config files which can be used	42	Environment variables for ``*config``:
50	as a base configuration in case the .config does not exist yet. Entries in
51	the list are separated with whitespaces to each other, and the first one
52	that exists is used.
53		43
54	KCONFIG_OVERWRITECONFIG	44	``KCONFIG_CONFIG``
55	-----------------------	45	This environment variable can be used to specify a default kernel config
56	If you set KCONFIG_OVERWRITECONFIG in the environment, Kconfig will not	46	file name to override the default name of ".config".
57	break symlinks when .config is a symlink to somewhere else.
58		47
59	KCONFIG_WARN_UNKNOWN_SYMBOLS	48	``KCONFIG_DEFCONFIG_LIST``
60	----------------------------	49	This environment variable specifies a list of config files which can be
61	This environment variable makes Kconfig warn about all unrecognized	50	used as a base configuration in case the .config does not exist yet.
62	symbols in the config input.	51	Entries in the list are separated with whitespaces to each other, and
		52	the first one that exists is used.
63		53
64	KCONFIG_WERROR	54	``KCONFIG_OVERWRITECONFIG``
65	--------------	55	If you set KCONFIG_OVERWRITECONFIG in the environment, Kconfig will not
66	If set, Kconfig treats warnings as errors.	56	break symlinks when .config is a symlink to somewhere else.
67		57
68	`CONFIG_`	58	``KCONFIG_WARN_UNKNOWN_SYMBOLS``
69	---------	59	This environment variable makes Kconfig warn about all unrecognized
70	If you set `CONFIG_` in the environment, Kconfig will prefix all symbols	60	symbols in the config input.
71	with its value when saving the configuration, instead of using the default,
72	`CONFIG_`.
73		61
74	----------------------------------------------------------------------	62	``KCONFIG_WERROR``
		63	If set, Kconfig treats warnings as errors.
75		64
76	Environment variables for '{allyes/allmod/allno/rand}config'	65	``CONFIG_``
		66	If you set ``CONFIG_`` in the environment, Kconfig will prefix all symbols
		67	with its value when saving the configuration, instead of using the
		68	default, ``CONFIG_``.
77		69
78	KCONFIG_ALLCONFIG	70	Environment variables for ``{allyes/allmod/allno/rand}config``:
79	-----------------
80	(partially based on lkml email from/by Rob Landley, re: miniconfig)
81		71
82	--------------------------------------------------	72	``KCONFIG_ALLCONFIG``
		73	The allyesconfig/allmodconfig/allnoconfig/randconfig variants can also
		74	use the environment variable KCONFIG_ALLCONFIG as a flag or a filename
		75	that contains config symbols that the user requires to be set to a
		76	specific value. If KCONFIG_ALLCONFIG is used without a filename where
		77	KCONFIG_ALLCONFIG == "" or KCONFIG_ALLCONFIG == "1", ``make *config``
		78	checks for a file named "all{yes/mod/no/def/random}.config"
		79	(corresponding to the ``*config`` command that was used) for symbol values
		80	that are to be forced. If this file is not found, it checks for a
		81	file named "all.config" to contain forced values.
83		82
84	The allyesconfig/allmodconfig/allnoconfig/randconfig variants can also	83	This enables you to create "miniature" config (miniconfig) or custom
85	use the environment variable KCONFIG_ALLCONFIG as a flag or a filename	84	config files containing just the config symbols that you are interested
86	that contains config symbols that the user requires to be set to a	85	in. Then the kernel config system generates the full .config file,
87	specific value. If KCONFIG_ALLCONFIG is used without a filename where	86	including symbols of your miniconfig file.
88	KCONFIG_ALLCONFIG == "" or KCONFIG_ALLCONFIG == "1", `make *config`
89	checks for a file named "all{yes/mod/no/def/random}.config"
90	(corresponding to the `*config` command that was used) for symbol values
91	that are to be forced. If this file is not found, it checks for a
92	file named "all.config" to contain forced values.
93		87
94	This enables you to create "miniature" config (miniconfig) or custom	88	This ``KCONFIG_ALLCONFIG`` file is a config file which contains
95	config files containing just the config symbols that you are interested	89	(usually a subset of all) preset config symbols. These variable
96	in. Then the kernel config system generates the full .config file,	90	settings are still subject to normal dependency checks.
97	including symbols of your miniconfig file.
98
99	This 'KCONFIG_ALLCONFIG' file is a config file which contains
100	(usually a subset of all) preset config symbols. These variable
101	settings are still subject to normal dependency checks.
102
103	Examples::
104		91
105	KCONFIG_ALLCONFIG=custom-notebook.config make allnoconfig	92	Examples::
106		93
107	or::	94	KCONFIG_ALLCONFIG=custom-notebook.config make allnoconfig
108		95
109	KCONFIG_ALLCONFIG=mini.config make allnoconfig	96	or::
110		97
111	or::	98	KCONFIG_ALLCONFIG=mini.config make allnoconfig
112		99
113	make KCONFIG_ALLCONFIG=mini.config allnoconfig	100	or::
114		101
115	These examples will disable most options (allnoconfig) but enable or	102	make KCONFIG_ALLCONFIG=mini.config allnoconfig
116	disable the options that are explicitly listed in the specified
117	mini-config files.
118		103
119	----------------------------------------------------------------------	104	These examples will disable most options (allnoconfig) but enable or
		105	disable the options that are explicitly listed in the specified
		106	mini-config files.
120		107
121	Environment variables for 'randconfig'	108	Environment variables for ``randconfig``:
122		109
123	KCONFIG_SEED	110	``KCONFIG_SEED``
124	------------	111	You can set this to the integer value used to seed the RNG, if you want
125	You can set this to the integer value used to seed the RNG, if you want	112	to somehow debug the behaviour of the kconfig parser/frontends.
126	to somehow debug the behaviour of the kconfig parser/frontends.	113	If not set, the current time will be used.
127	If not set, the current time will be used.
128		114
129	KCONFIG_PROBABILITY	115	``KCONFIG_PROBABILITY``
130	-------------------	116	This variable can be used to skew the probabilities. This variable can
131	This variable can be used to skew the probabilities. This variable can	117	be unset or empty, or set to three different formats:
132	be unset or empty, or set to three different formats:
133		118
134	======================= ================== =====================	119	======================= ================== =====================
135	KCONFIG_PROBABILITY y:n split y:m:n split	120	KCONFIG_PROBABILITY y:n split y:m:n split
136	======================= ================== =====================	121	======================= ================== =====================
137	unset or empty 50 : 50 33 : 33 : 34	122	unset or empty 50 : 50 33 : 33 : 34
138	N N : 100-N N/2 : N/2 : 100-N	123	N N : 100-N N/2 : N/2 : 100-N
139	[1] N:M N+M : 100-(N+M) N : M : 100-(N+M)	124	[1] N:M N+M : 100-(N+M) N : M : 100-(N+M)
140	[2] N:M:L N : 100-N M : L : 100-(M+L)	125	[2] N:M:L N : 100-N M : L : 100-(M+L)
141	======================= ================== =====================	126	======================= ================== =====================
@@ -149,112 +134,98 @@ that: · 7 unmodified lines
149		134
150	Examples::	135	Examples::
151		136
152	KCONFIG_PROBABILITY=10	137	KCONFIG_PROBABILITY=10
153	10% of booleans will be set to 'y', 90% to 'n'	138	10% of booleans will be set to 'y', 90% to 'n'
154	5% of tristates will be set to 'y', 5% to 'm', 90% to 'n'	139	5% of tristates will be set to 'y', 5% to 'm', 90% to 'n'
155	KCONFIG_PROBABILITY=15:25	140	KCONFIG_PROBABILITY=15:25
156	40% of booleans will be set to 'y', 60% to 'n'	141	40% of booleans will be set to 'y', 60% to 'n'
157	15% of tristates will be set to 'y', 25% to 'm', 60% to 'n'	142	15% of tristates will be set to 'y', 25% to 'm', 60% to 'n'
158	KCONFIG_PROBABILITY=10:15:15	143	KCONFIG_PROBABILITY=10:15:15
159	10% of booleans will be set to 'y', 90% to 'n'	144	10% of booleans will be set to 'y', 90% to 'n'
160	15% of tristates will be set to 'y', 15% to 'm', 70% to 'n'	145	15% of tristates will be set to 'y', 15% to 'm', 70% to 'n'
161		146
162	----------------------------------------------------------------------	147	Environment variables for ``syncconfig``:
163		148
164	Environment variables for 'syncconfig'	149	``KCONFIG_NOSILENTUPDATE``
		150	If this variable has a non-blank value, it prevents silent kernel
		151	config updates (requires explicit updates).
165		152
166	KCONFIG_NOSILENTUPDATE	153	``KCONFIG_AUTOCONFIG``
167	----------------------	154	This environment variable can be set to specify the path & name of the
168	If this variable has a non-blank value, it prevents silent kernel	155	"auto.conf" file. Its default value is "include/config/auto.conf".
169	config updates (requires explicit updates).
170		156
171	KCONFIG_AUTOCONFIG	157	``KCONFIG_AUTOHEADER``
172	------------------	158	This environment variable can be set to specify the path & name of the
173	This environment variable can be set to specify the path & name of the	159	"autoconf.h" (header) file.
174	"auto.conf" file. Its default value is "include/config/auto.conf".	160	Its default value is "include/generated/autoconf.h".
175		161
176	KCONFIG_AUTOHEADER
177	------------------
178	This environment variable can be set to specify the path & name of the
179	"autoconf.h" (header) file.
180	Its default value is "include/generated/autoconf.h".
181
182
183	----------------------------------------------------------------------
184		162
185	menuconfig	163	menuconfig
186	----------	164	==========
187
188	SEARCHING for CONFIG symbols
189		165
190	Searching in menuconfig:	166	Searching in menuconfig:
191		167
192	The Search function searches for kernel configuration symbol	168	The Search function searches for kernel configuration symbol
193	names, so you have to know something close to what you are	169	names, so you have to know something close to what you are
194	looking for.	170	looking for.
195		171
196	Example::	172	Example::
197		173
198	/hotplug	174	/hotplug
199	This lists all config symbols that contain "hotplug",	175	This lists all config symbols that contain "hotplug",
200	e.g., HOTPLUG_CPU, MEMORY_HOTPLUG.	176	e.g., HOTPLUG_CPU, MEMORY_HOTPLUG.
201		177
202	For search help, enter / followed by TAB-TAB (to highlight	178	For search help, enter / followed by TAB-TAB (to highlight
203	<Help>) and Enter. This will tell you that you can also use	179	<Help>) and Enter. This will tell you that you can also use
204	regular expressions (regexes) in the search string, so if you	180	regular expressions (regexes) in the search string, so if you
205	are not interested in MEMORY_HOTPLUG, you could try::	181	are not interested in MEMORY_HOTPLUG, you could try::
206		182
207	/^hotplug	183	/^hotplug
208		184
209	When searching, symbols are sorted thus:	185	When searching, symbols are sorted thus:
210		186
211	- first, exact matches, sorted alphabetically (an exact match	187	- first, exact matches, sorted alphabetically (an exact match
212	is when the search matches the complete symbol name);	188	is when the search matches the complete symbol name);
213	- then, other matches, sorted alphabetically.	189	- then, other matches, sorted alphabetically.
214		190
215	For example: ^ATH.K matches:	191	For example, ^ATH.K matches:
216		192
217	ATH5K ATH9K ATH5K_AHB ATH5K_DEBUG [...] ATH6KL ATH6KL_DEBUG	193	ATH5K ATH9K ATH5K_AHB ATH5K_DEBUG [...] ATH6KL ATH6KL_DEBUG
218	[...] ATH9K_AHB ATH9K_BTCOEX_SUPPORT ATH9K_COMMON [...]	194	[...] ATH9K_AHB ATH9K_BTCOEX_SUPPORT ATH9K_COMMON [...]
219		195
220	of which only ATH5K and ATH9K match exactly and so are sorted	196	of which only ATH5K and ATH9K match exactly and so are sorted
221	first (and in alphabetical order), then come all other symbols,	197	first (and in alphabetical order), then come all other symbols,
222	sorted in alphabetical order.	198	sorted in alphabetical order.
223		199
224	In this menu, pressing the key in the (#) prefix will jump	200	In this menu, pressing the key in the (#) prefix will jump
225	directly to that location. You will be returned to the current	201	directly to that location. You will be returned to the current
226	search results after exiting this new menu.	202	search results after exiting this new menu.
227		203
228	----------------------------------------------------------------------	204	User interface options for 'menuconfig':
229		205
230	User interface options for 'menuconfig'	206	``MENUCONFIG_COLOR``
		207	It is possible to select different color themes using the variable
		208	MENUCONFIG_COLOR. To select a theme use::
231		209
232	MENUCONFIG_COLOR	210	make MENUCONFIG_COLOR=<theme> menuconfig
233	----------------
234	It is possible to select different color themes using the variable
235	MENUCONFIG_COLOR. To select a theme use::
236		211
237	make MENUCONFIG_COLOR=<theme> menuconfig	212	Available themes are::
238		213
239	Available themes are::	214	- mono => selects colors suitable for monochrome displays
		215	- blackbg => selects a color scheme with black background
		216	- classic => theme with blue background. The classic look
		217	- bluetitle => a LCD friendly version of classic. (default)
240		218
241	- mono => selects colors suitable for monochrome displays	219	``MENUCONFIG_MODE``
242	- blackbg => selects a color scheme with black background	220	This mode shows all sub-menus in one large tree.
243	- classic => theme with blue background. The classic look
244	- bluetitle => a LCD friendly version of classic. (default)
245		221
246	MENUCONFIG_MODE	222	Example::
247	---------------
248	This mode shows all sub-menus in one large tree.
249		223
250	Example::	224	make MENUCONFIG_MODE=single_menu menuconfig
251		225
252	make MENUCONFIG_MODE=single_menu menuconfig
253
254	----------------------------------------------------------------------
255		226
256	nconfig	227	nconfig
257	-------	228	=======
258		229
259	nconfig is an alternate text-based configurator. It lists function	230	nconfig is an alternate text-based configurator. It lists function
260	keys across the bottom of the terminal (window) that execute commands.	231	keys across the bottom of the terminal (window) that execute commands.
@@ -266,61 +237,59 @@ Use F1 for Global help or F3 for the Short help menu. · 5 unmodified lines
266		237
267	Searching in nconfig:	238	Searching in nconfig:
268		239
269	You can search either in the menu entry "prompt" strings	240	You can search either in the menu entry "prompt" strings
270	or in the configuration symbols.	241	or in the configuration symbols.
		242
		243	Use / to begin a search through the menu entries. This does
		244	not support regular expressions. Use <Down> or <Up> for
		245	Next hit and Previous hit, respectively. Use <Esc> to
		246	terminate the search mode.
271		247
272	Use / to begin a search through the menu entries. This does	248	F8 (SymSearch) searches the configuration symbols for the
273	not support regular expressions. Use <Down> or <Up> for	249	given string or regular expression (regex).
274	Next hit and Previous hit, respectively. Use <Esc> to
275	terminate the search mode.
276		250
277	F8 (SymSearch) searches the configuration symbols for the	251	In the SymSearch, pressing the key in the (#) prefix will
278	given string or regular expression (regex).	252	jump directly to that location. You will be returned to the
		253	current search results after exiting this new menu.
279		254
280	In the SymSearch, pressing the key in the (#) prefix will	255	Environment variables:
281	jump directly to that location. You will be returned to the
282	current search results after exiting this new menu.
283		256
284	NCONFIG_MODE	257	``NCONFIG_MODE``
285	------------	258	This mode shows all sub-menus in one large tree.
286	This mode shows all sub-menus in one large tree.
287		259
288	Example::	260	Example::
289		261
290	make NCONFIG_MODE=single_menu nconfig	262	make NCONFIG_MODE=single_menu nconfig
291		263
292	----------------------------------------------------------------------
293		264
294	xconfig	265	xconfig
295	-------	266	=======
296		267
297	Searching in xconfig:	268	Searching in xconfig:
298		269
299	The Search function searches for kernel configuration symbol	270	The Search function searches for kernel configuration symbol
300	names, so you have to know something close to what you are	271	names, so you have to know something close to what you are
301	looking for.	272	looking for.
302
303	Example::
304		273
305	Ctrl-F hotplug	274	Example::
306		275
307	or::	276	Ctrl-F hotplug
308		277
309	Menu: File, Search, hotplug	278	or::
310		279
311	lists all config symbol entries that contain "hotplug" in	280	Menu: File, Search, hotplug
312	the symbol name. In this Search dialog, you may change the
313	config setting for any of the entries that are not grayed out.
314	You can also enter a different search string without having
315	to return to the main menu.
316		281
		282	lists all config symbol entries that contain "hotplug" in
		283	the symbol name. In this Search dialog, you may change the
		284	config setting for any of the entries that are not grayed out.
		285	You can also enter a different search string without having
		286	to return to the main menu.
317		287
318	----------------------------------------------------------------------
319		288
320	gconfig	289	gconfig
321	-------	290	=======
322		291
323	Searching in gconfig:	292	Searching in gconfig:
324		293
325	There is no search command in gconfig. However, gconfig does	294	There is no search command in gconfig. However, gconfig does
326	have several different viewing choices, modes, and options.	295	have several different viewing choices, modes, and options.

Makefile+28−21

 # prepare rule.
 this-makefile := $(lastword $(MAKEFILE_LIST))
-export abs_srctree := $(realpath $(dir $(this-makefile)))
+abs_srctree := $(realpath $(dir $(this-makefile)))
-export abs_objtree := $(CURDIR)
+abs_objtree := $(CURDIR)
 ifneq ($(sub_make_done),1)
 ifneq ($(filter $(no-dot-config-targets), $(MAKECMDGOALS)),)
     ifeq ($(filter-out $(no-dot-config-targets), $(MAKECMDGOALS)),)
-		need-config :=
+        need-config :=
     endif
 endif
 ifneq ($(filter $(no-sync-config-targets), $(MAKECMDGOALS)),)
     ifeq ($(filter-out $(no-sync-config-targets), $(MAKECMDGOALS)),)
-		may-sync-config :=
+        may-sync-config :=
     endif
 endif
 need-compiler := $(may-sync-config)
 ifneq ($(KBUILD_EXTMOD),)
-	may-sync-config :=
+    may-sync-config :=
 endif
 ifeq ($(KBUILD_EXTMOD),)
-        ifneq ($(filter %config,$(MAKECMDGOALS)),)
+    ifneq ($(filter %config,$(MAKECMDGOALS)),)
-		config-build := 1
+        config-build := 1
-                ifneq ($(words $(MAKECMDGOALS)),1)
+        ifneq ($(words $(MAKECMDGOALS)),1)
-			mixed-build := 1
+            mixed-build := 1
-                endif
         endif
+    endif
 endif
 # We cannot build single targets and the others at the same time
 ifneq ($(filter $(single-targets), $(MAKECMDGOALS)),)
-	single-build := 1
+    single-build := 1
     ifneq ($(filter-out $(single-targets), $(MAKECMDGOALS)),)
-		mixed-build := 1
+        mixed-build := 1
     endif
 endif
 # For "make -j clean all", "make -j mrproper defconfig all", etc.
 ifneq ($(filter $(clean-targets),$(MAKECMDGOALS)),)
-        ifneq ($(filter-out $(clean-targets),$(MAKECMDGOALS)),)
+    ifneq ($(filter-out $(clean-targets),$(MAKECMDGOALS)),)
-		mixed-build := 1
+        mixed-build := 1
-        endif
+    endif
 endif
 # install and modules_install need also be processed one by one
 ifneq ($(filter install,$(MAKECMDGOALS)),)
-        ifneq ($(filter modules_install,$(MAKECMDGOALS)),)
+    ifneq ($(filter modules_install,$(MAKECMDGOALS)),)
-		mixed-build := 1
+        mixed-build := 1
-        endif
+    endif
 endif
 ifdef mixed-build
 endif
 ifneq ($(CONFIG_FUNCTION_ALIGNMENT),0)
+# Set the minimal function alignment. Use the newer GCC option
+# -fmin-function-alignment if it is available, or fall back to -falign-funtions.
+# See also CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT.
+ifdef CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT
+KBUILD_CFLAGS += -fmin-function-alignment=$(CONFIG_FUNCTION_ALIGNMENT)
+else
 KBUILD_CFLAGS += -falign-functions=$(CONFIG_FUNCTION_ALIGNMENT)
 endif
+endif
 # arch Makefile may override CC so keep this after arch Makefile is included
 NOSTDINC_FLAGS += -nostdinc
 PHONY += dtbs dtbs_prepare dtbs_install dtbs_check
 dtbs: dtbs_prepare
-	$(Q)$(MAKE) $(build)=$(dtstree)
+	$(Q)$(MAKE) $(build)=$(dtstree) need-dtbslist=1
 # include/config/kernel.release is actually needed when installing DTBs because
 # INSTALL_DTBS_PATH contains $(KERNELRELEASE). However, we do not want to make
 dtbs_check: dtbs
 dtbs_install:
-	$(Q)$(MAKE) $(dtbinst)=$(dtstree) dst=$(INSTALL_DTBS_PATH)
+	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.dtbinst obj=$(dtstree)
 ifdef CONFIG_OF_EARLY_FLATTREE
 all: dtbs
 		-o -name '*.ko.*' \
 		-o -name '*.dtb' -o -name '*.dtbo' \
 		-o -name '*.dtb.S' -o -name '*.dtbo.S' \
-		-o -name '*.dt.yaml' \
+		-o -name '*.dt.yaml' -o -name 'dtbs-list' \
 		-o -name '*.dwo' -o -name '*.lst' \
 		-o -name '*.su' -o -name '*.mod' \
 		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \

arch/Kconfig+12−0

@@ -1597,4 +1597,16 @@ config FUNCTION_ALIGNMENT · 1596 unmodified lines
1597	default 4 if FUNCTION_ALIGNMENT_4B	1597	default 4 if FUNCTION_ALIGNMENT_4B
1598	default 0	1598	default 0
1599		1599
		1600	config CC_HAS_MIN_FUNCTION_ALIGNMENT
		1601	# Detect availability of the GCC option -fmin-function-alignment which
		1602	# guarantees minimal alignment for all functions, unlike
		1603	# -falign-functions which the compiler ignores for cold functions.
		1604	def_bool $(cc-option, -fmin-function-alignment=8)
		1605
		1606	config CC_HAS_SANE_FUNCTION_ALIGNMENT
		1607	# Set if the guaranteed alignment with -fmin-function-alignment is
		1608	# available or extra care is required in the kernel. Clang provides
		1609	# strict alignment always, even with -falign-functions.
		1610	def_bool CC_HAS_MIN_FUNCTION_ALIGNMENT \|\| CC_IS_CLANG
		1611
1600	endmenu	1612	endmenu

arch/alpha/Kconfig+4−11

 	bool
 	depends on ALPHA_JENSEN || (ALPHA_SABLE && !ALPHA_GAMMA) || ALPHA_LYNX || ALPHA_NORITAKE && !ALPHA_PRIMO || ALPHA_MIKASA && !ALPHA_PRIMO || ALPHA_CABRIOLET || ALPHA_AVANTI_CH || ALPHA_EB64P_CH || ALPHA_XL || ALPHA_NONAME || ALPHA_EB66 || ALPHA_EB66P || ALPHA_P2K
 	default y if !ALPHA_LYNX
+	default y if !ALPHA_EV5
 config ALPHA_LCA
 	bool
 	bool "EV5 CPU(s) (model 5/xxx)?" if ALPHA_LYNX
 	default y if ALPHA_RX164 || ALPHA_RAWHIDE || ALPHA_MIATA || ALPHA_LX164 || ALPHA_SX164 || ALPHA_RUFFIAN || ALPHA_SABLE && ALPHA_GAMMA || ALPHA_NORITAKE && ALPHA_PRIMO || ALPHA_MIKASA && ALPHA_PRIMO || ALPHA_PC164 || ALPHA_TAKARA || ALPHA_EB164 || ALPHA_ALCOR
-config ALPHA_EV4
-	bool
-	default y if ALPHA_LYNX && !ALPHA_EV5
 config ALPHA_CIA
 	bool
 	depends on ALPHA_MIATA || ALPHA_LX164 || ALPHA_SX164 || ALPHA_RUFFIAN || ALPHA_NORITAKE && ALPHA_PRIMO || ALPHA_MIKASA && ALPHA_PRIMO || ALPHA_PC164 || ALPHA_TAKARA || ALPHA_EB164 || ALPHA_ALCOR
 	  Say Y if you have an AS 1000 5/xxx or an AS 1000A 5/xxx.
 config ALPHA_GAMMA
-	bool "EV5 CPU(s) (model 5/xxx)?"
+	bool "EV5 CPU(s) (model 5/xxx)?" if ALPHA_SABLE
-	depends on ALPHA_SABLE
+	depends on ALPHA_SABLE || ALPHA_LYNX
+	default ALPHA_LYNX
 	help
 	  Say Y if you have an AS 2000 5/xxx or an AS 2100 5/xxx.
-config ALPHA_GAMMA
-	bool
-	depends on ALPHA_LYNX
-	default y
 config ALPHA_T2
 	bool
 	depends on ALPHA_SABLE || ALPHA_LYNX

arch/hexagon/Kconfig+3−9

 	select ARCH_32BIT_OFF_T
 	select ARCH_HAS_SYNC_DMA_FOR_DEVICE
 	select ARCH_NO_PREEMPT
+	select ARCH_WANT_FRAME_POINTERS
 	select DMA_GLOBAL_POOL
 	select HAVE_PAGE_SIZE_4KB
 	select HAVE_PAGE_SIZE_16KB
 	select HAVE_PAGE_SIZE_64KB
 	select HAVE_PAGE_SIZE_256KB
+	select FRAME_POINTER
 	# Other pending projects/to-do items.
 	# select HAVE_REGS_AND_STACK_ACCESS_API
 	# select HAVE_HW_BREAKPOINT if PERF_EVENTS
 	select HAVE_PERF_EVENTS
 	# GENERIC_ALLOCATOR is used by dma_alloc_coherent()
 	select GENERIC_ALLOCATOR
+	select GENERIC_IRQ_PROBE
 	select GENERIC_IRQ_SHOW
 	select HAVE_ARCH_KGDB
 	select HAVE_ARCH_TRACEHOOK
 	help
 	  Platforms that don't load the kernel at zero set this.
-config FRAME_POINTER
-	def_bool y
 config LOCKDEP_SUPPORT
 	def_bool y
 config GENERIC_CSUM
 	def_bool y
-#
-# Use the generic interrupt handling code in kernel/irq/:
-#
-config GENERIC_IRQ_PROBE
-	def_bool y
 config GENERIC_HWEIGHT
 	def_bool y

arch/parisc/Kconfig+2−2

 	def_bool y if !MODULES || UBSAN || FTRACE || COMPILE_TEST
 config MLONGCALLS
-	def_bool y if PARISC_HUGE_KERNEL
 	bool "Enable the -mlong-calls compiler option for big kernels" if !PARISC_HUGE_KERNEL
 	depends on PA8X00
+	default PARISC_HUGE_KERNEL
 	help
 	  If you configure the kernel to include many drivers built-in instead
 	  as modules, the kernel executable may become too big, so that the
 	  Enabling this option will probably slow down your kernel.
 config 64BIT
-	def_bool y if "$(ARCH)" = "parisc64"
 	bool "64-bit kernel" if "$(ARCH)" = "parisc"
 	depends on PA8X00
+	default "$(ARCH)" = "parisc64"
 	help
 	  Enable this if you want to support 64bit kernel on PA-RISC platform.

arch/riscv/kernel/tests/Kconfig.debug+1−1

@@ -6,7 +6,7 @@ config AS_HAS_ULEB128 · 5 unmodified lines
6		6
7	menuconfig RUNTIME_KERNEL_TESTING_MENU	7	menuconfig RUNTIME_KERNEL_TESTING_MENU
8	bool "arch/riscv/kernel runtime Testing"	8	bool "arch/riscv/kernel runtime Testing"
9	def_bool y	9	default y
10	help	10	help
11	Enable riscv kernel runtime testing.	11	Enable riscv kernel runtime testing.
12		12

arch/x86/entry/vdso/Makefile+2−0

 # Sanitizer runtimes are unavailable and cannot be linked here.
 KASAN_SANITIZE			:= n
 KMSAN_SANITIZE_vclock_gettime.o := n
+KMSAN_SANITIZE_vdso32/vclock_gettime.o	:= n
 KMSAN_SANITIZE_vgetcpu.o	:= n
+KMSAN_SANITIZE_vdso32/vgetcpu.o	:= n
 UBSAN_SANITIZE			:= n
 KCSAN_SANITIZE			:= n

arch/x86/kvm/Kconfig+1−1

 	  will be called kvm-amd.
 config KVM_AMD_SEV
-	def_bool y
 	bool "AMD Secure Encrypted Virtualization (SEV) support"
+	default y
 	depends on KVM_AMD && X86_64
 	depends on CRYPTO_DEV_SP_PSP && !(KVM_AMD=y && CRYPTO_DEV_CCP_DD=m)
 	help

arch/x86/kvm/Makefile+2−1

@@ -4,7 +4,8 @@ ccflags-y += -I $(srctree)/arch/x86/kvm · 3 unmodified lines
4	ccflags-$(CONFIG_KVM_WERROR) += -Werror	4	ccflags-$(CONFIG_KVM_WERROR) += -Werror
5		5
6	ifeq ($(CONFIG_FRAME_POINTER),y)	6	ifeq ($(CONFIG_FRAME_POINTER),y)
7	OBJECT_FILES_NON_STANDARD_vmenter.o := y	7	OBJECT_FILES_NON_STANDARD_vmx/vmenter.o := y
		8	OBJECT_FILES_NON_STANDARD_svm/vmenter.o := y
8	endif	9	endif
9		10
10	include $(srctree)/virt/kvm/Makefile.kvm	11	include $(srctree)/virt/kvm/Makefile.kvm

arch/x86/xen/Kconfig+0−1

@@ -81,7 +81,6 @@ config XEN_PVH · 80 unmodified lines
81	bool "Xen PVH guest support"	81	bool "Xen PVH guest support"
82	depends on XEN && XEN_PVHVM && ACPI	82	depends on XEN && XEN_PVHVM && ACPI
83	select PVH	83	select PVH
84	def_bool n
85	help	84	help
86	Support for running as a Xen PVH guest.	85	Support for running as a Xen PVH guest.
87		86

drivers/acpi/Kconfig+0−1

@@ -460,7 +460,6 @@ config ACPI_BGRT · 459 unmodified lines
460		460
461	config ACPI_REDUCED_HARDWARE_ONLY	461	config ACPI_REDUCED_HARDWARE_ONLY
462	bool "Hardware-reduced ACPI support only" if EXPERT	462	bool "Hardware-reduced ACPI support only" if EXPERT
463	def_bool n
464	help	463	help
465	This config item changes the way the ACPI code is built. When this	464	This config item changes the way the ACPI code is built. When this
466	option is selected, the kernel will use a specialized version of	465	option is selected, the kernel will use a specialized version of

drivers/iommu/intel/Kconfig+1−1

 	  the default value.
 config INTEL_IOMMU_PERF_EVENTS
-	def_bool y
 	bool "Intel IOMMU performance events"
+	default y
 	depends on INTEL_IOMMU && PERF_EVENTS
 	help
 	  Selecting this option will enable the performance monitoring

drivers/md/Kconfig+0−1

@@ -519,7 +519,6 @@ config DM_VERITY · 518 unmodified lines
519	If unsure, say N.	519	If unsure, say N.
520		520
521	config DM_VERITY_VERIFY_ROOTHASH_SIG	521	config DM_VERITY_VERIFY_ROOTHASH_SIG
522	def_bool n
523	bool "Verity data device root hash signature verification support"	522	bool "Verity data device root hash signature verification support"
524	depends on DM_VERITY	523	depends on DM_VERITY
525	select SYSTEM_DATA_VERIFICATION	524	select SYSTEM_DATA_VERIFICATION

include/linux/compiler_types.h+5−5

@@ -99,17 +99,17 @@ static inline void __chk_io_ptr(const volatile void __iomem *ptr) { } · 98 unmodified lines
99	* gcc: https://gcc.gnu.org/onlinedocs/gcc/Label-Attributes.html#index-cold-label-attribute	99	* gcc: https://gcc.gnu.org/onlinedocs/gcc/Label-Attributes.html#index-cold-label-attribute
100	*	100	*
101	* When -falign-functions=N is in use, we must avoid the cold attribute as	101	* When -falign-functions=N is in use, we must avoid the cold attribute as
102	* contemporary versions of GCC drop the alignment for cold functions. Worse,	102	* GCC drops the alignment for cold functions. Worse, GCC can implicitly mark
103	* GCC can implicitly mark callees of cold functions as cold themselves, so	103	* callees of cold functions as cold themselves, so it's not sufficient to add
104	* it's not sufficient to add __function_aligned here as that will not ensure	104	* __function_aligned here as that will not ensure that callees are correctly
105	* that callees are correctly aligned.	105	* aligned.
106	*	106	*
107	* See:	107	* See:
108	*	108	*
109	* https://lore.kernel.org/lkml/Y77%2FqVgvaJidFpYt@FVFF77S0Q05N	109	* https://lore.kernel.org/lkml/Y77%2FqVgvaJidFpYt@FVFF77S0Q05N
110	* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88345#c9	110	* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88345#c9
111	*/	111	*/
112	#if !defined(CONFIG_CC_IS_GCC) \|\| (CONFIG_FUNCTION_ALIGNMENT == 0)	112	#if defined(CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT) \|\| (CONFIG_FUNCTION_ALIGNMENT == 0)
113	#define __cold __attribute__((__cold__))	113	#define __cold __attribute__((__cold__))
114	#else	114	#else
115	#define __cold	115	#define __cold

init/Kconfig+1−1

@@ -1499,7 +1499,7 @@ config MULTIUSER · 1498 unmodified lines
1499		1499
1500	config SGETMASK_SYSCALL	1500	config SGETMASK_SYSCALL
1501	bool "sgetmask/ssetmask syscalls support" if EXPERT	1501	bool "sgetmask/ssetmask syscalls support" if EXPERT
1502	def_bool PARISC \|\| M68K \|\| PPC \|\| MIPS \|\| X86 \|\| SPARC \|\| MICROBLAZE \|\| SUPERH	1502	default PARISC \|\| M68K \|\| PPC \|\| MIPS \|\| X86 \|\| SPARC \|\| MICROBLAZE \|\| SUPERH
1503	help	1503	help
1504	sys_sgetmask and sys_ssetmask are obsolete system calls	1504	sys_sgetmask and sys_ssetmask are obsolete system calls
1505	no longer supported in libc but still enabled by default in some	1505	no longer supported in libc but still enabled by default in some

kernel/module/Kconfig+1−2

@@ -362,8 +362,7 @@ config MODPROBE_PATH · 361 unmodified lines
362	userspace can still load modules explicitly).	362	userspace can still load modules explicitly).
363		363
364	config TRIM_UNUSED_KSYMS	364	config TRIM_UNUSED_KSYMS
365	bool "Trim unused exported kernel symbols" if EXPERT	365	bool "Trim unused exported kernel symbols"
366	depends on !COMPILE_TEST
367	help	366	help
368	The kernel and some modules make many symbols available for	367	The kernel and some modules make many symbols available for
369	other modules to use via EXPORT_SYMBOL() and variants. Depending	368	other modules to use via EXPORT_SYMBOL() and variants. Depending

lib/Kconfig.debug+1−1

@@ -2127,7 +2127,7 @@ config KCOV_IRQ_AREA_SIZE · 2126 unmodified lines
2127		2127
2128	menuconfig RUNTIME_TESTING_MENU	2128	menuconfig RUNTIME_TESTING_MENU
2129	bool "Runtime Testing"	2129	bool "Runtime Testing"
2130	def_bool y	2130	default y
2131		2131
2132	if RUNTIME_TESTING_MENU	2132	if RUNTIME_TESTING_MENU
2133		2133

mm/Kconfig+3−4

 # support for memory balloon compaction
 config BALLOON_COMPACTION
 	bool "Allow for balloon memory compaction/migration"
-	def_bool y
+	default y
 	depends on COMPACTION && MEMORY_BALLOON
 	help
 	  Memory fragmentation introduced by ballooning might reduce
 # support for memory compaction
 config COMPACTION
 	bool "Allow for memory compaction"
-	def_bool y
+	default y
 	select MIGRATION
 	depends on MMU
 	help
 # support for free page reporting
 config PAGE_REPORTING
 	bool "Free page reporting"
-	def_bool n
 	help
 	  Free page reporting allows for the incremental acquisition of
 	  free pages from the buddy allocator for the purpose of reporting
 #
 config MIGRATION
 	bool "Page migration"
-	def_bool y
+	default y
 	depends on (NUMA || ARCH_ENABLE_MEMORY_HOTREMOVE || COMPACTION || CMA) && MMU
 	help
 	  Allows the migration of the physical location of pages of processes

net/dccp/ccids/Kconfig+1−1

@@ -13,7 +13,7 @@ config IP_DCCP_CCID2_DEBUG · 12 unmodified lines
13		13
14	config IP_DCCP_CCID3	14	config IP_DCCP_CCID3
15	bool "CCID-3 (TCP-Friendly)"	15	bool "CCID-3 (TCP-Friendly)"
16	def_bool y if (IP_DCCP = y \|\| IP_DCCP = m)	16	default IP_DCCP = y \|\| IP_DCCP = m
17	help	17	help
18	CCID-3 denotes TCP-Friendly Rate Control (TFRC), an equation-based	18	CCID-3 denotes TCP-Friendly Rate Control (TFRC), an equation-based
19	rate-controlled congestion control mechanism. TFRC is designed to	19	rate-controlled congestion control mechanism. TFRC is designed to

rust/Makefile+2−2

@@ -100,7 +100,7 @@ rustdoc: rustdoc-core rustdoc-macros rustdoc-compiler_builtins \ · 99 unmodified lines
100	-e 's:rust-logo-[0-9a-f]+\.svg:logo.svg:g' \	100	-e 's:rust-logo-[0-9a-f]+\.svg:logo.svg:g' \
101	-e 's:favicon-[0-9a-f]+\.svg:logo.svg:g' \	101	-e 's:favicon-[0-9a-f]+\.svg:logo.svg:g' \
102	-e 's:<link rel="alternate icon" type="image/png" href="[/.]+/static\.files/favicon-(16x16\|32x32)-[0-9a-f]+\.png">::g' \	102	-e 's:<link rel="alternate icon" type="image/png" href="[/.]+/static\.files/favicon-(16x16\|32x32)-[0-9a-f]+\.png">::g' \
103	-e 's:<a href="srctree/([^"]+)">:<a href="$(abs_srctree)/\1">:g'	103	-e 's:<a href="srctree/([^"]+)">:<a href="$(realpath $(srctree))/\1">:g'
104	$(Q)for f in $(rustdoc_output)/static.files/rustdoc-*.css; do \	104	$(Q)for f in $(rustdoc_output)/static.files/rustdoc-*.css; do \
105	echo ".logo-container > img { object-fit: contain; }" >> $$f; done	105	echo ".logo-container > img { object-fit: contain; }" >> $$f; done
106		106
@@ -414,7 +414,7 @@ quiet_cmd_rustc_library = $(if $(skip_clippy),RUSTC,$(RUSTC_OR_CLIPPY_QUIET)) L · 307 unmodified lines
414	rust-analyzer:	414	rust-analyzer:
415	$(Q)$(srctree)/scripts/generate_rust_analyzer.py \	415	$(Q)$(srctree)/scripts/generate_rust_analyzer.py \
416	--cfgs='core=$(core-cfgs)' --cfgs='alloc=$(alloc-cfgs)' \	416	--cfgs='core=$(core-cfgs)' --cfgs='alloc=$(alloc-cfgs)' \
417	$(abs_srctree) $(abs_objtree) \	417	$(realpath $(srctree)) $(realpath $(objtree)) \
418	$(RUST_LIB_SRC) $(KBUILD_EXTMOD) > \	418	$(RUST_LIB_SRC) $(KBUILD_EXTMOD) > \
419	$(if $(KBUILD_EXTMOD),$(extmod_prefix),$(objtree))/rust-project.json	419	$(if $(KBUILD_EXTMOD),$(extmod_prefix),$(objtree))/rust-project.json
420		420

scripts/Kbuild.include+0−6

 # $(Q)$(MAKE) $(build)=dir
 build := -f $(srctree)/scripts/Makefile.build obj
-###
-# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.dtbinst obj=
-# Usage:
-# $(Q)$(MAKE) $(dtbinst)=dir
-dtbinst := -f $(srctree)/scripts/Makefile.dtbinst obj
 ###
 # Shorthand for $(Q)$(MAKE) -f scripts/Makefile.clean obj=
 # Usage:

scripts/Makefile.build+13−9

 # subdir-builtin and subdir-modorder may contain duplications. Use $(sort ...)
 subdir-builtin := $(sort $(filter %/built-in.a, $(real-obj-y)))
 subdir-modorder := $(sort $(filter %/modules.order, $(obj-m)))
+subdir-dtbslist := $(sort $(filter %/dtbs-list, $(dtb-y)))
 targets-for-builtin := $(extra-y)
 # 'OBJECT_FILES_NON_STANDARD_foo.o := 'y': skip objtool checking for a file
 # 'OBJECT_FILES_NON_STANDARD_foo.o := 'n': override directory skip for a file
-is-standard-object = $(if $(filter-out y%, $(OBJECT_FILES_NON_STANDARD_$(basetarget).o)$(OBJECT_FILES_NON_STANDARD)n),y)
+is-standard-object = $(if $(filter-out y%, $(OBJECT_FILES_NON_STANDARD_$(target-stem).o)$(OBJECT_FILES_NON_STANDARD)n),y)
 $(obj)/%.o: objtool-enabled = $(if $(is-standard-object),$(if $(delay-objtool),$(is-single-obj-m),y))
 # To build objects in subdirs, we need to descend into the directories
 $(subdir-builtin): $(obj)/%/built-in.a: $(obj)/% ;
 $(subdir-modorder): $(obj)/%/modules.order: $(obj)/% ;
+$(subdir-dtbslist): $(obj)/%/dtbs-list: $(obj)/% ;
 #
 # Rule to compile a set of .o files into one .a file (without symbol table)
 	$(call if_changed,ar_builtin)
 #
-# Rule to create modules.order file
+# Rule to create modules.order and dtbs-list
 #
-# Create commands to either record .ko file or cat modules.order from
+# This is a list of build artifacts (module or dtb) from the current Makefile
-# a subdirectory
+# and its sub-directories. The timestamp should be updated when any of the
-# Add $(obj-m) as the prerequisite to avoid updating the timestamp of
+# member files.
-# modules.order unless contained modules are updated.
-cmd_modules_order = { $(foreach m, $(real-prereqs), \
+cmd_gen_order = { $(foreach m, $(real-prereqs), \
-	$(if $(filter %/modules.order, $m), cat $m, echo $m);) :; } \
+	$(if $(filter %/$(notdir $@), $m), cat $m, echo $m);) :; } \
 	> $@
 $(obj)/modules.order: $(obj-m) FORCE
-	$(call if_changed,modules_order)
+	$(call if_changed,gen_order)
+$(obj)/dtbs-list: $(dtb-y) FORCE
+	$(call if_changed,gen_order)
 #
 # Rule to compile a set of .o files into one .a file (with symbol table)

scripts/Makefile.dtbinst+18−14

@@ -8,32 +8,36 @@ · 7 unmodified lines
8	# $INSTALL_PATH/dtbs/$KERNELRELEASE	8	# $INSTALL_PATH/dtbs/$KERNELRELEASE
9	# ==========================================================================	9	# ==========================================================================
10		10
11	src := $(obj)
12
13	PHONY := __dtbs_install	11	PHONY := __dtbs_install
14	__dtbs_install:	12	__dtbs_install:
15		13
16	include include/config/auto.conf	14	include include/config/auto.conf
17	include $(srctree)/scripts/Kbuild.include	15	include $(srctree)/scripts/Kbuild.include
18	include $(kbuild-file)
19
20	dtbs := $(addprefix $(dst)/, $(dtb-y) $(if $(CONFIG_OF_ALL_DTBS),$(dtb-)))
21	subdirs := $(addprefix $(obj)/, $(subdir-y) $(subdir-m))
22		16
23	__dtbs_install: $(dtbs) $(subdirs)	17	dst := $(INSTALL_DTBS_PATH)
24	@:
25		18
26	quiet_cmd_dtb_install = INSTALL $@	19	quiet_cmd_dtb_install = INSTALL $@
27	cmd_dtb_install = install -D $< $@	20	cmd_dtb_install = install -D $< $@
28		21
29	$(dst)/%.dtb: $(obj)/%.dtb	22	$(dst)/%: $(obj)/%
30	$(call cmd,dtb_install)	23	$(call cmd,dtb_install)
31		24
32	$(dst)/%.dtbo: $(obj)/%.dtbo	25	dtbs := $(patsubst $(obj)/%,%,$(call read-file, $(obj)/dtbs-list))
33	$(call cmd,dtb_install)	26
		27	ifdef CONFIG_ARCH_WANT_FLAT_DTB_INSTALL
34		28
35	PHONY += $(subdirs)	29	define gen_install_rules
36	$(subdirs):	30	$(dst)/%: $(obj)/$(1)%
37	$(Q)$(MAKE) $(dtbinst)=$@ dst=$(if $(CONFIG_ARCH_WANT_FLAT_DTB_INSTALL),$(dst),$(patsubst $(obj)/%,$(dst)/%,$@))	31	$$(call cmd,dtb_install)
		32	endef
		33
		34	$(foreach d, $(sort $(dir $(dtbs))), $(eval $(call gen_install_rules,$(d))))
		35
		36	dtbs := $(notdir $(dtbs))
		37
		38	endif # CONFIG_ARCH_WANT_FLAT_DTB_INSTALL
		39
		40	__dtbs_install: $(addprefix $(dst)/, $(dtbs))
		41	@:
38		42
39	.PHONY: $(PHONY)	43	.PHONY: $(PHONY)

scripts/Makefile.extrawarn+2−1

 KBUILD_CFLAGS += -Wno-tautological-constant-out-of-range-compare
 KBUILD_CFLAGS += $(call cc-disable-warning, unaligned-access)
 KBUILD_CFLAGS += $(call cc-disable-warning, cast-function-type-strict)
+KBUILD_CFLAGS += -Wno-enum-compare-conditional
+KBUILD_CFLAGS += -Wno-enum-enum-conversion
 endif
 endif
 KBUILD_CFLAGS += -Wredundant-decls
 KBUILD_CFLAGS += -Wsign-compare
 KBUILD_CFLAGS += -Wswitch-default
-KBUILD_CFLAGS += $(call cc-option, -Wpacked-bitfield-compat)
 KBUILD_CPPFLAGS += -DKBUILD_EXTRA_WARN3

scripts/Makefile.lib+16−10

 obj-y		:= $(filter-out %/, $(obj-y))
 endif
+ifdef need-dtbslist
+dtb-y		+= $(addsuffix /dtbs-list, $(subdir-ym))
+always-y	+= dtbs-list
+endif
 # Expand $(foo-objs) $(foo-y) etc. by replacing their individuals
 suffix-search = $(strip $(foreach s, $3, $($(1:%$(strip $2)=%$s))))
 # List composite targets that are constructed by combining other targets
 real-obj-y	:= $(addprefix $(obj)/,$(real-obj-y))
 real-obj-m	:= $(addprefix $(obj)/,$(real-obj-m))
 multi-obj-m	:= $(addprefix $(obj)/, $(multi-obj-m))
+dtb-y		:= $(addprefix $(obj)/, $(dtb-y))
 multi-dtb-y	:= $(addprefix $(obj)/, $(multi-dtb-y))
 real-dtb-y	:= $(addprefix $(obj)/, $(real-dtb-y))
 subdir-ym	:= $(addprefix $(obj)/,$(subdir-ym))
 #
 ifeq ($(CONFIG_GCOV_KERNEL),y)
 _c_flags += $(if $(patsubst n%,, \
-		$(GCOV_PROFILE_$(basetarget).o)$(GCOV_PROFILE)$(CONFIG_GCOV_PROFILE_ALL)), \
+		$(GCOV_PROFILE_$(target-stem).o)$(GCOV_PROFILE)$(CONFIG_GCOV_PROFILE_ALL)), \
 		$(CFLAGS_GCOV))
 endif
 ifeq ($(CONFIG_KASAN),y)
 ifneq ($(CONFIG_KASAN_HW_TAGS),y)
 _c_flags += $(if $(patsubst n%,, \
-		$(KASAN_SANITIZE_$(basetarget).o)$(KASAN_SANITIZE)y), \
+		$(KASAN_SANITIZE_$(target-stem).o)$(KASAN_SANITIZE)y), \
 		$(CFLAGS_KASAN), $(CFLAGS_KASAN_NOSANITIZE))
 endif
 endif
 ifeq ($(CONFIG_KMSAN),y)
 _c_flags += $(if $(patsubst n%,, \
-		$(KMSAN_SANITIZE_$(basetarget).o)$(KMSAN_SANITIZE)y), \
+		$(KMSAN_SANITIZE_$(target-stem).o)$(KMSAN_SANITIZE)y), \
 		$(CFLAGS_KMSAN))
 _c_flags += $(if $(patsubst n%,, \
-		$(KMSAN_ENABLE_CHECKS_$(basetarget).o)$(KMSAN_ENABLE_CHECKS)y), \
+		$(KMSAN_ENABLE_CHECKS_$(target-stem).o)$(KMSAN_ENABLE_CHECKS)y), \
 		, -mllvm -msan-disable-checks=1)
 endif
 ifeq ($(CONFIG_UBSAN),y)
 _c_flags += $(if $(patsubst n%,, \
-		$(UBSAN_SANITIZE_$(basetarget).o)$(UBSAN_SANITIZE)y), \
+		$(UBSAN_SANITIZE_$(target-stem).o)$(UBSAN_SANITIZE)y), \
 		$(CFLAGS_UBSAN))
 _c_flags += $(if $(patsubst n%,, \
-		$(UBSAN_SIGNED_WRAP_$(basetarget).o)$(UBSAN_SANITIZE_$(basetarget).o)$(UBSAN_SIGNED_WRAP)$(UBSAN_SANITIZE)y), \
+		$(UBSAN_SIGNED_WRAP_$(target-stem).o)$(UBSAN_SANITIZE_$(target-stem).o)$(UBSAN_SIGNED_WRAP)$(UBSAN_SANITIZE)y), \
 		$(CFLAGS_UBSAN_SIGNED_WRAP))
 endif
 ifeq ($(CONFIG_KCOV),y)
 _c_flags += $(if $(patsubst n%,, \
-	$(KCOV_INSTRUMENT_$(basetarget).o)$(KCOV_INSTRUMENT)$(CONFIG_KCOV_INSTRUMENT_ALL)), \
+	$(KCOV_INSTRUMENT_$(target-stem).o)$(KCOV_INSTRUMENT)$(CONFIG_KCOV_INSTRUMENT_ALL)), \
 	$(CFLAGS_KCOV))
 endif
 #
 ifeq ($(CONFIG_KCSAN),y)
 _c_flags += $(if $(patsubst n%,, \
-	$(KCSAN_SANITIZE_$(basetarget).o)$(KCSAN_SANITIZE)y), \
+	$(KCSAN_SANITIZE_$(target-stem).o)$(KCSAN_SANITIZE)y), \
 	$(CFLAGS_KCSAN))
 # Some uninstrumented files provide implied barriers required to avoid false
 # positives: set KCSAN_INSTRUMENT_BARRIERS for barrier instrumentation only.
 _c_flags += $(if $(patsubst n%,, \
-	$(KCSAN_INSTRUMENT_BARRIERS_$(basetarget).o)$(KCSAN_INSTRUMENT_BARRIERS)n), \
+	$(KCSAN_INSTRUMENT_BARRIERS_$(target-stem).o)$(KCSAN_INSTRUMENT_BARRIERS)n), \
 	-D__KCSAN_INSTRUMENT_BARRIERS__)
 endif
 	-Wunique_unit_address
 endif
-DTC_FLAGS += $(DTC_FLAGS_$(basetarget))
+DTC_FLAGS += $(DTC_FLAGS_$(target-stem))
 # Set -@ if the target is a base DTB that overlay is applied onto
 DTC_FLAGS += $(if $(filter $(patsubst $(obj)/%,%,$@), $(base-dtb-y)), -@)

scripts/Makefile.package+1−1

@@ -135,7 +135,7 @@ snap-pkg: · 134 unmodified lines
135	mkdir $(objtree)/snap	135	mkdir $(objtree)/snap
136	$(MAKE) clean	136	$(MAKE) clean
137	sed "s@KERNELRELEASE@$(KERNELRELEASE)@; \	137	sed "s@KERNELRELEASE@$(KERNELRELEASE)@; \
138	s@SRCTREE@$(abs_srctree)@" \	138	s@SRCTREE@$(realpath $(srctree))@" \
139	$(srctree)/scripts/package/snapcraft.template > \	139	$(srctree)/scripts/package/snapcraft.template > \
140	$(objtree)/snap/snapcraft.yaml	140	$(objtree)/snap/snapcraft.yaml
141	cd $(objtree)/snap && \	141	cd $(objtree)/snap && \

scripts/kconfig/array_size.h+11−0

@@ -0,0 +1,11 @@
	1	/* SPDX-License-Identifier: GPL-2.0 */
	2	#ifndef ARRAY_SIZE_H
	3	#define ARRAY_SIZE_H
	4
	5	/**
	6	* ARRAY_SIZE - get the number of elements in array @arr
	7	* @arr: array to be sized
	8	*/
	9	#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
	10
	11	#endif /* ARRAY_SIZE_H */

scripts/kconfig/conf.c+6−6

 #include <sys/time.h>
 #include <errno.h>
+#include "internal.h"
 #include "lkc.h"
 static void conf(struct menu *menu);
 static bool conf_set_all_new_symbols(enum conf_def_mode mode)
 {
 	struct symbol *sym, *csym;
-	int i, cnt;
+	int cnt;
 	/*
 	 * can't go as the default in switch-case below, otherwise gcc whines
 	 * about -Wmaybe-uninitialized
 		}
 	}
-	for_all_symbols(i, sym) {
+	for_all_symbols(sym) {
 		if (sym_has_value(sym) || sym->flags & SYMBOL_VALID)
 			continue;
 		switch (sym_get_type(sym)) {
 	 * and the rest to no.
 	 */
 	if (mode != def_random) {
-		for_all_symbols(i, csym) {
+		for_all_symbols(csym) {
 			if ((sym_is_choice(csym) && !sym_has_value(csym)) ||
 			    sym_is_choice_value(csym))
 				csym->flags |= SYMBOL_NEED_SET_CHOICE_VALUES;
 		}
 	}
-	for_all_symbols(i, csym) {
+	for_all_symbols(csym) {
 		if (sym_has_value(csym) || !sym_is_choice(csym))
 			continue;
 static void conf_rewrite_tristates(tristate old_val, tristate new_val)
 {
 	struct symbol *sym;
-	int i;
-	for_all_symbols(i, sym) {
+	for_all_symbols(sym) {
 		if (sym_get_type(sym) == S_TRISTATE &&
 		    sym->def[S_DEF_USER].tri == old_val)
 			sym->def[S_DEF_USER].tri = new_val;

scripts/kconfig/confdata.c+18−78

 #include <time.h>
 #include <unistd.h>
+#include "internal.h"
 #include "lkc.h"
+struct gstr autoconf_cmd;
 /* return true if 'path' exists, false otherwise */
 static bool is_present(const char *path)
 {
 	return 0;
 }
-#define LINE_GROWTH 16
-static int add_byte(int c, char **lineptr, size_t slen, size_t *n)
-{
-	size_t new_size = slen + 1;
-	if (new_size > *n) {
-		new_size += LINE_GROWTH - 1;
-		new_size *= 2;
-		*lineptr = xrealloc(*lineptr, new_size);
-		*n = new_size;
-	}
-	(*lineptr)[slen] = c;
-	return 0;
-}
-static ssize_t compat_getline(char **lineptr, size_t *n, FILE *stream)
-{
-	char *line = *lineptr;
-	size_t slen = 0;
-	for (;;) {
-		int c = getc(stream);
-		switch (c) {
-		case '\n':
-			if (add_byte(c, &line, slen, n) < 0)
-				goto e_out;
-			slen++;
-			/* fall through */
-		case EOF:
-			if (add_byte('\0', &line, slen, n) < 0)
-				goto e_out;
-			*lineptr = line;
-			if (slen == 0)
-				return -1;
-			return slen;
-		default:
-			if (add_byte(c, &line, slen, n) < 0)
-				goto e_out;
-			slen++;
-		}
-	}
-e_out:
-	line[slen-1] = '\0';
-	*lineptr = line;
-	return -1;
-}
 /* like getline(), but the newline character is stripped away */
 static ssize_t getline_stripped(char **lineptr, size_t *n, FILE *stream)
 {
 	ssize_t len;
-	len = compat_getline(lineptr, n, stream);
+	len = getline(lineptr, n, stream);
 	if (len > 0 && (*lineptr)[len - 1] == '\n') {
 		len--;
 	size_t  line_asize = 0;
 	char *p, *val;
 	struct symbol *sym;
-	int i, def_flags;
+	int def_flags;
 	const char *warn_unknown, *sym_name;
 	warn_unknown = getenv("KCONFIG_WARN_UNKNOWN_SYMBOLS");
 	conf_warnings = 0;
 	def_flags = SYMBOL_DEF << def;
-	for_all_symbols(i, sym) {
+	for_all_symbols(sym) {
 		sym->flags |= SYMBOL_CHANGED;
 		sym->flags &= ~(def_flags|SYMBOL_VALID);
 		if (sym_is_choice(sym))
 {
 	struct symbol *sym;
 	int conf_unsaved = 0;
-	int i;
 	conf_set_changed(false);
 	sym_calc_value(modules_sym);
-	for_all_symbols(i, sym) {
+	for_all_symbols(sym) {
 		sym_calc_value(sym);
 		if (sym_is_choice(sym) || (sym->flags & SYMBOL_NO_WRITE))
 			continue;
 		/* maybe print value in verbose mode... */
 	}
-	for_all_symbols(i, sym) {
+	for_all_symbols(sym) {
 		if (sym_has_value(sym) && !sym_is_choice_value(sym)) {
 			/* Reset values of generates values, so they'll appear
 			 * as new, if they should become visible, but that
 	while (menu != NULL)
 	{
 		sym = menu->sym;
-		if (sym == NULL) {
+		if (sym && !sym_is_choice(sym)) {
-			if (!menu_is_visible(menu))
-				goto next_menu;
-		} else if (!sym_is_choice(sym)) {
 			sym_calc_value(sym);
 			if (!(sym->flags & SYMBOL_WRITE))
 				goto next_menu;
 	const char *str;
 	char tmpname[PATH_MAX + 1], oldname[PATH_MAX + 1];
 	char *env;
-	int i;
 	bool need_newline = false;
 	if (!name)
 	}
 	fclose(out);
-	for_all_symbols(i, sym)
+	for_all_symbols(sym)
 		sym->flags &= ~SYMBOL_WRITTEN;
 	if (*tmpname) {
 static int conf_write_autoconf_cmd(const char *autoconf_name)
 {
 	char name[PATH_MAX], tmp[PATH_MAX];
-	struct file *file;
 	FILE *out;
 	int ret;
 		return -1;
 	}
-	fprintf(out, "deps_config := \\\n");
+	fprintf(out, "autoconfig := %s\n", autoconf_name);
-	for (file = file_list; file; file = file->next)
-		fprintf(out, "\t%s \\\n", file->name);
-	fprintf(out, "\n%s: $(deps_config)\n\n", autoconf_name);
-	env_write_dep(out, autoconf_name);
+	fputs(str_get(&autoconf_cmd), out);
-	fprintf(out, "\n$(deps_config): ;\n");
 	fflush(out);
 	ret = ferror(out); /* error check for all fprintf() calls */
 {
 	const char *name, *tmp;
 	struct symbol *sym;
-	int res, i;
+	int res;
 	name = conf_get_autoconfig_name();
 	tmp = strrchr(name, '/');
 	conf_read_simple(name, S_DEF_AUTO);
 	sym_calc_value(modules_sym);
-	for_all_symbols(i, sym) {
+	for_all_symbols(sym) {
 		sym_calc_value(sym);
 		if ((sym->flags & SYMBOL_NO_WRITE) || !sym->name)
 			continue;
 	char tmp[PATH_MAX];
 	FILE *file;
 	struct symbol *sym;
-	int ret, i;
+	int ret;
 	if (make_parent_dir(filename))
 		return -1;
 	conf_write_heading(file, comment_style);
-	for_all_symbols(i, sym)
+	for_all_symbols(sym)
 		if ((sym->flags & SYMBOL_WRITE) && sym->name)
 			print_symbol(file, sym);
 {
 	struct symbol *sym;
 	const char *autoconf_name = conf_get_autoconfig_name();
-	int ret, i;
+	int ret;
 	if (!overwrite && is_present(autoconf_name))
 		return 0;
 	if (conf_touch_deps())
 		return 1;
-	for_all_symbols(i, sym)
+	for_all_symbols(sym)
 		sym_calc_value(sym);
 	ret = __conf_write_autoconf(conf_get_autoheader_name(),

scripts/kconfig/expr.h+11−18

 #include <assert.h>
 #include <stdio.h>
-#include "list.h"
+#include "list_types.h"
 #ifndef __cplusplus
 #include <stdbool.h>
 #endif
-struct file {
+#include "list_types.h"
-	struct file *next;
-	struct file *parent;
-	const char *name;
-	int lineno;
-};
 typedef enum tristate {
 	no, mod, yes
  * SYMBOL_CHOICE bit set in 'flags'.
  */
 struct symbol {
-	/* The next symbol in the same bucket in the symbol hash table */
+	/* link node for the hash table */
-	struct symbol *next;
+	struct hlist_node node;
 	/* The name of the symbol, e.g. "FOO" for 'config FOO' */
 	char *name;
 	 */
 	tristate visible;
+	/* config entries associated with this symbol */
+	struct list_head menus;
 	/* SYMBOL_* flags */
 	int flags;
 	struct expr_value implied;
 };
-#define for_all_symbols(i, sym) for (i = 0; i < SYMBOL_HASHSIZE; i++) for (sym = symbol_hash[i]; sym; sym = sym->next)
 #define SYMBOL_CONST      0x0001  /* symbol is const */
 #define SYMBOL_CHECK      0x0008  /* used during dependency checking */
 #define SYMBOL_CHOICE     0x0010  /* start of a choice block (null name) */
 #define SYMBOL_NEED_SET_CHOICE_VALUES  0x100000
 #define SYMBOL_MAXLENGTH	256
-#define SYMBOL_HASHSIZE		9973
 /* A property represent the config options that can be associated
  * with a config "symbol".
 	struct menu *menu;         /* the menu the property are associated with
 	                            * valid for: P_SELECT, P_RANGE, P_CHOICE,
 	                            * P_PROMPT, P_DEFAULT, P_MENU, P_COMMENT */
-	struct file *file;         /* what file was this property defined */
+	const char *filename;      /* what file was this property defined */
 	int lineno;                /* what lineno was this property defined */
 };
 	 */
 	struct symbol *sym;
+	struct list_head link;	/* link to symbol::menus */
 	/*
 	 * The prompt associated with the node. This holds the prompt for a
 	 * symbol as well as the text for a menu or comment, along with the
 	char *help;
 	/* The location where the menu node appears in the Kconfig files */
-	struct file *file;
+	const char *filename;
 	int lineno;
 	/* For use by front ends that need to store auxiliary data */
 	struct menu *target;
 };
-extern struct file *file_list;
-extern struct file *current_file;
-struct file *lookup_file(const char *name);
 extern struct symbol symbol_yes, symbol_no, symbol_mod;
 extern struct symbol *modules_sym;
 extern int cdebug;

scripts/kconfig/hashtable.h+48−0

@@ -0,0 +1,48 @@
	1	/* SPDX-License-Identifier: GPL-2.0-only */
	2	#ifndef HASHTABLE_H
	3	#define HASHTABLE_H
	4
	5	#include "array_size.h"
	6	#include "list.h"
	7
	8	#define HASH_SIZE(name) (ARRAY_SIZE(name))
	9
	10	#define HASHTABLE_DECLARE(name, size) struct hlist_head name[size]
	11
	12	#define HASHTABLE_DEFINE(name, size) \
	13	HASHTABLE_DECLARE(name, size) = \
	14	{ [0 ... ((size) - 1)] = HLIST_HEAD_INIT }
	15
	16	#define hash_head(table, key) (&(table)[(key) % HASH_SIZE(table)])
	17
	18	/**
	19	* hash_add - add an object to a hashtable
	20	* @table: hashtable to add to
	21	* @node: the &struct hlist_node of the object to be added
	22	* @key: the key of the object to be added
	23	*/
	24	#define hash_add(table, node, key) \
	25	hlist_add_head(node, hash_head(table, key))
	26
	27	/**
	28	* hash_for_each - iterate over a hashtable
	29	* @table: hashtable to iterate
	30	* @obj: the type * to use as a loop cursor for each entry
	31	* @member: the name of the hlist_node within the struct
	32	*/
	33	#define hash_for_each(table, obj, member) \
	34	for (int _bkt = 0; _bkt < HASH_SIZE(table); _bkt++) \
	35	hlist_for_each_entry(obj, &table[_bkt], member)
	36
	37	/**
	38	* hash_for_each_possible - iterate over all possible objects hashing to the
	39	* same bucket
	40	* @table: hashtable to iterate
	41	* @obj: the type * to use as a loop cursor for each entry
	42	* @member: the name of the hlist_node within the struct
	43	* @key: the key of the objects to iterate over
	44	*/
	45	#define hash_for_each_possible(table, obj, member, key) \
	46	hlist_for_each_entry(obj, hash_head(table, key), member)
	47
	48	#endif /* HASHTABLE_H */

scripts/kconfig/internal.h+12−0

@@ -2,8 +2,20 @@ · 1 unmodified line
2	#ifndef INTERNAL_H	2	#ifndef INTERNAL_H
3	#define INTERNAL_H	3	#define INTERNAL_H
4		4
		5	#include "hashtable.h"
		6
		7	#define SYMBOL_HASHSIZE (1U << 14)
		8
		9	extern HASHTABLE_DECLARE(sym_hashtable, SYMBOL_HASHSIZE);
		10
		11	#define for_all_symbols(sym) \
		12	hash_for_each(sym_hashtable, sym, node)
		13
5	struct menu;	14	struct menu;
6		15
7	extern struct menu current_menu, current_entry;	16	extern struct menu current_menu, current_entry;
8		17
		18	extern const char *cur_filename;
		19	extern int cur_lineno;
		20
9	#endif /* INTERNAL_H */	21	#endif /* INTERNAL_H */

scripts/kconfig/lexer.l+61−69

@@ -14,16 +14,22 @@ · 13 unmodified lines
14	#include <string.h>	14	#include <string.h>
15		15
16	#include "lkc.h"	16	#include "lkc.h"
		17	#include "preprocess.h"
		18
17	#include "parser.tab.h"	19	#include "parser.tab.h"
18		20
19	#define YY_DECL static int yylex1(void)	21	#define YY_DECL static int yylex1(void)
20		22
21	#define START_STRSIZE 16	23	#define START_STRSIZE 16
22		24
23	static struct {	25	/* The Kconfig file currently being parsed. */
24	struct file *file;	26	const char *cur_filename;
25	int lineno;	27
26	} current_pos;	28	/*
		29	* The line number of the current statement. This does not match yylineno.
		30	* yylineno is used by the lexer, while cur_lineno is used by the parser.
		31	*/
		32	int cur_lineno;
27		33
28	static int prev_prev_token = T_EOL;	34	static int prev_prev_token = T_EOL;
29	static int prev_token = T_EOL;	35	static int prev_token = T_EOL;
@@ -33,6 +39,9 @@ static int text_size, text_asize; · 3 unmodified lines
33	struct buffer {	39	struct buffer {
34	struct buffer *parent;	40	struct buffer *parent;
35	YY_BUFFER_STATE state;	41	YY_BUFFER_STATE state;
		42	int yylineno;
		43	const char *filename;
		44	int source_lineno;
36	};	45	};
37		46
38	static struct buffer *current_buf;	47	static struct buffer *current_buf;
@@ -77,7 +86,7 @@ static void warn_ignored_character(char chr) · 38 unmodified lines
77	{	86	{
78	fprintf(stderr,	87	fprintf(stderr,
79	"%s:%d:warning: ignoring unsupported character '%c'\n",	88	"%s:%d:warning: ignoring unsupported character '%c'\n",
80	current_file->name, yylineno, chr);	89	cur_filename, yylineno, chr);
81	}	90	}
82	%}	91	%}
83		92
@@ -180,7 +189,7 @@ n [A-Za-z0-9_-] · 96 unmodified lines
180	\n {	189	\n {
181	fprintf(stderr,	190	fprintf(stderr,
182	"%s:%d:warning: multi-line strings not supported\n",	191	"%s:%d:warning: multi-line strings not supported\n",
183	zconf_curname(), zconf_lineno());	192	cur_filename, cur_lineno);
184	unput('\n');	193	unput('\n');
185	BEGIN(INITIAL);	194	BEGIN(INITIAL);
186	yylval.string = text;	195	yylval.string = text;
@@ -246,9 +255,9 @@ n [A-Za-z0-9_-] · 59 unmodified lines
246		255
247	if (prev_token != T_EOL && prev_token != T_HELPTEXT)	256	if (prev_token != T_EOL && prev_token != T_HELPTEXT)
248	fprintf(stderr, "%s:%d:warning: no new line at end of file\n",	257	fprintf(stderr, "%s:%d:warning: no new line at end of file\n",
249	current_file->name, yylineno);	258	cur_filename, yylineno);
250		259
251	if (current_file) {	260	if (current_buf) {
252	zconf_endfile();	261	zconf_endfile();
253	return T_EOL;	262	return T_EOL;
254	}	263	}
@@ -267,19 +276,17 @@ repeat: · 12 unmodified lines
267	token = yylex1();	276	token = yylex1();
268		277
269	if (prev_token == T_EOL \|\| prev_token == T_HELPTEXT) {	278	if (prev_token == T_EOL \|\| prev_token == T_HELPTEXT) {
270	if (token == T_EOL) {	279	if (token == T_EOL)
271	/* Do not pass unneeded T_EOL to the parser. */	280	/* Do not pass unneeded T_EOL to the parser. */
272	goto repeat;	281	goto repeat;
273	} else {	282	else
274	/*	283	/*
275	* For the parser, update file/lineno at the first token	284	* For the parser, update lineno at the first token
276	* of each statement. Generally, \n is a statement	285	* of each statement. Generally, \n is a statement
277	* terminator in Kconfig, but it is not always true	286	* terminator in Kconfig, but it is not always true
278	* because \n could be escaped by a backslash.	287	* because \n could be escaped by a backslash.
279	*/	288	*/
280	current_pos.file = current_file;	289	cur_lineno = yylineno;
281	current_pos.lineno = yylineno;
282	}
283	}	290	}
284		291
285	if (prev_prev_token == T_EOL && prev_token == T_WORD &&	292	if (prev_prev_token == T_EOL && prev_token == T_WORD &&
@@ -302,8 +309,11 @@ static char expand_token(const char in, size_t n) · 16 unmodified lines
302	new_string();	309	new_string();
303	append_string(in, n);	310	append_string(in, n);
304		311
305	/* get the whole line because we do not know the end of token. */	312	/*
306	while ((c = input()) != EOF) {	313	* get the whole line because we do not know the end of token.
		314	* input() returns 0 (not EOF!) when it reachs the end of file.
		315	*/
		316	while ((c = input()) != 0) {
307	if (c == '\n') {	317	if (c == '\n') {
308	unput(c);	318	unput(c);
309	break;	319	break;
@@ -391,78 +401,60 @@ void zconf_initscan(const char *name) · 81 unmodified lines
391	exit(1);	401	exit(1);
392	}	402	}
393		403
394	current_buf = xmalloc(sizeof(*current_buf));	404	cur_filename = file_lookup(name);
395	memset(current_buf, 0, sizeof(*current_buf));
396
397	current_file = file_lookup(name);
398	yylineno = 1;	405	yylineno = 1;
399	}	406	}
400		407
401	void zconf_nextfile(const char *name)	408	void zconf_nextfile(const char *name)
402	{	409	{
403	struct file *iter;
404	struct file *file = file_lookup(name);
405	struct buffer buf = xmalloc(sizeof(buf));	410	struct buffer buf = xmalloc(sizeof(buf));
406	memset(buf, 0, sizeof(*buf));	411	bool recur_include = false;
407		412
408	current_buf->state = YY_CURRENT_BUFFER;	413	buf->state = YY_CURRENT_BUFFER;
409	yyin = zconf_fopen(file->name);	414	buf->yylineno = yylineno;
		415	buf->filename = cur_filename;
		416	buf->source_lineno = cur_lineno;
		417	buf->parent = current_buf;
		418	current_buf = buf;
		419	yyin = zconf_fopen(name);
410	if (!yyin) {	420	if (!yyin) {
411	fprintf(stderr, "%s:%d: can't open file \"%s\"\n",	421	fprintf(stderr, "%s:%d: can't open file \"%s\"\n",
412	zconf_curname(), zconf_lineno(), file->name);	422	cur_filename, cur_lineno, name);
413	exit(1);	423	exit(1);
414	}	424	}
415	yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));	425	yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
416	buf->parent = current_buf;
417	current_buf = buf;
418		426
419	current_file->lineno = yylineno;	427	for (buf = current_buf; buf; buf = buf->parent) {
420	file->parent = current_file;	428	if (!strcmp(buf->filename, name))
421		429	recur_include = true;
422	for (iter = current_file; iter; iter = iter->parent) {
423	if (!strcmp(iter->name, file->name)) {
424	fprintf(stderr,
425	"Recursive inclusion detected.\n"
426	"Inclusion path:\n"
427	" current file : %s\n", file->name);
428	iter = file;
429	do {
430	iter = iter->parent;
431	fprintf(stderr, " included from: %s:%d\n",
432	iter->name, iter->lineno - 1);
433	} while (strcmp(iter->name, file->name));
434	exit(1);
435	}
436	}	430	}
437		431
438	yylineno = 1;	432	if (recur_include) {
439	current_file = file;	433	fprintf(stderr,
440	}	434	"Recursive inclusion detected.\n"
441		435	"Inclusion path:\n"
442	static void zconf_endfile(void)	436	" current file : %s\n", name);
443	{
444	struct buffer *parent;
445
446	current_file = current_file->parent;
447	if (current_file)
448	yylineno = current_file->lineno;
449		437
450	parent = current_buf->parent;	438	for (buf = current_buf; buf; buf = buf->parent)
451	if (parent) {	439	fprintf(stderr, " included from: %s:%d\n",
452	fclose(yyin);	440	buf->filename, buf->source_lineno);
453	yy_delete_buffer(YY_CURRENT_BUFFER);	441	exit(1);
454	yy_switch_to_buffer(parent->state);
455	}	442	}
456	free(current_buf);
457	current_buf = parent;
458	}
459		443
460	int zconf_lineno(void)	444	yylineno = 1;
461	{	445	cur_filename = file_lookup(name);
462	return current_pos.lineno;
463	}	446	}
464		447
465	const char *zconf_curname(void)	448	static void zconf_endfile(void)
466	{	449	{
467	return current_pos.file ? current_pos.file->name : "<none>";	450	struct buffer *tmp;
		451
		452	fclose(yyin);
		453	yy_delete_buffer(YY_CURRENT_BUFFER);
		454	yy_switch_to_buffer(current_buf->state);
		455	yylineno = current_buf->yylineno;
		456	cur_filename = current_buf->filename;
		457	tmp = current_buf;
		458	current_buf = current_buf->parent;
		459	free(tmp);
468	}	460	}

scripts/kconfig/list.h+189−65

@@ -2,29 +2,39 @@ · 1 unmodified line
2	#ifndef LIST_H	2	#ifndef LIST_H
3	#define LIST_H	3	#define LIST_H
4		4
5	/*	5	#include <stddef.h>
6	* Copied from include/linux/...
7	*/
8		6
9	#undef offsetof	7	#include "list_types.h"
10	#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)	8
		9	/* Are two types/vars the same type (ignoring qualifiers)? */
		10	#define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
11		11
12	/**	12	/**
13	* container_of - cast a member of a structure out to the containing structure	13	* container_of - cast a member of a structure out to the containing structure
14	* @ptr: the pointer to the member.	14	* @ptr: the pointer to the member.
15	* @type: the type of the container struct this is embedded in.	15	* @type: the type of the container struct this is embedded in.
16	* @member: the name of the member within the struct.	16	* @member: the name of the member within the struct.
17	*	17	*
18	*/	18	*/
19	#define container_of(ptr, type, member) ({ \	19	#define container_of(ptr, type, member) ({ \
20	const typeof( ((type )0)->member ) __mptr = (ptr); \	20	void __mptr = (void )(ptr); \
21	(type )( (char )__mptr - offsetof(type,member) );})	21	_Static_assert(__same_type((ptr), ((type )0)->member) \|\| \
22		22	__same_type(*(ptr), void), \
		23	"pointer type mismatch in container_of()"); \
		24	((type *)(__mptr - offsetof(type, member))); })
23		25
24	struct list_head {	26	#define LIST_POISON1 ((void *) 0x100)
25	struct list_head next, prev;	27	#define LIST_POISON2 ((void *) 0x122)
26	};
27		28
		29	/*
		30	* Circular doubly linked list implementation.
		31	*
		32	* Some of the internal functions ("__xxx") are useful when
		33	* manipulating whole lists rather than single entries, as
		34	* sometimes we already know the next/prev entries and we can
		35	* generate better code by using them directly rather than
		36	* using the generic single-entry routines.
		37	*/
28		38
29	#define LIST_HEAD_INIT(name) { &(name), &(name) }	39	#define LIST_HEAD_INIT(name) { &(name), &(name) }
30		40
@@ -32,45 +42,16 @@ struct list_head { · 1 unmodified line
32	struct list_head name = LIST_HEAD_INIT(name)	42	struct list_head name = LIST_HEAD_INIT(name)
33		43
34	/**	44	/**
35	* list_entry - get the struct for this entry	45	* INIT_LIST_HEAD - Initialize a list_head structure
36	* @ptr: the &struct list_head pointer.	46	* @list: list_head structure to be initialized.
37	* @type: the type of the struct this is embedded in.	47	*
38	* @member: the name of the list_head within the struct.	48	* Initializes the list_head to point to itself. If it is a list header,
39	*/	49	* the result is an empty list.
40	#define list_entry(ptr, type, member) \
41	container_of(ptr, type, member)
42
43	/**
44	* list_for_each_entry - iterate over list of given type
45	* @pos: the type * to use as a loop cursor.
46	* @head: the head for your list.
47	* @member: the name of the list_head within the struct.
48	*/
49	#define list_for_each_entry(pos, head, member) \
50	for (pos = list_entry((head)->next, typeof(*pos), member); \
51	&pos->member != (head); \
52	pos = list_entry(pos->member.next, typeof(*pos), member))
53
54	/**
55	* list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
56	* @pos: the type * to use as a loop cursor.
57	* @n: another type * to use as temporary storage
58	* @head: the head for your list.
59	* @member: the name of the list_head within the struct.
60	*/
61	#define list_for_each_entry_safe(pos, n, head, member) \
62	for (pos = list_entry((head)->next, typeof(*pos), member), \
63	n = list_entry(pos->member.next, typeof(*pos), member); \
64	&pos->member != (head); \
65	pos = n, n = list_entry(n->member.next, typeof(*n), member))
66
67	/**
68	* list_empty - tests whether a list is empty
69	* @head: the list to test.
70	*/	50	*/
71	static inline int list_empty(const struct list_head *head)	51	static inline void INIT_LIST_HEAD(struct list_head *list)
72	{	52	{
73	return head->next == head;	53	list->next = list;
		54	list->prev = list;
74	}	55	}
75		56
76	/*	57	/*
@@ -79,14 +60,27 @@ static inline int list_empty(const struct list_head *head) · 2 unmodified lines
79	* This is only for internal list manipulation where we know	60	* This is only for internal list manipulation where we know
80	* the prev/next entries already!	61	* the prev/next entries already!
81	*/	62	*/
82	static inline void __list_add(struct list_head *_new,	63	static inline void __list_add(struct list_head *new,
83	struct list_head *prev,	64	struct list_head *prev,
84	struct list_head *next)	65	struct list_head *next)
85	{	66	{
86	next->prev = _new;	67	next->prev = new;
87	_new->next = next;	68	new->next = next;
88	_new->prev = prev;	69	new->prev = prev;
89	prev->next = _new;	70	prev->next = new;
		71	}
		72
		73	/**
		74	* list_add - add a new entry
		75	* @new: new entry to be added
		76	* @head: list head to add it after
		77	*
		78	* Insert a new entry after the specified head.
		79	* This is good for implementing stacks.
		80	*/
		81	static inline void list_add(struct list_head new, struct list_head head)
		82	{
		83	__list_add(new, head, head->next);
90	}	84	}
91		85
92	/**	86	/**
@@ -97,9 +91,9 @@ static inline void __list_add(struct list_head *_new, · 4 unmodified lines
97	* Insert a new entry before the specified head.	91	* Insert a new entry before the specified head.
98	* This is useful for implementing queues.	92	* This is useful for implementing queues.
99	*/	93	*/
100	static inline void list_add_tail(struct list_head _new, struct list_head head)	94	static inline void list_add_tail(struct list_head new, struct list_head head)
101	{	95	{
102	__list_add(_new, head->prev, head);	96	__list_add(new, head->prev, head);
103	}	97	}
104		98
105	/*	99	/*
@@ -115,8 +109,11 @@ static inline void __list_del(struct list_head prev, struct list_head next) · 9 unmodified lines
115	prev->next = next;	109	prev->next = next;
116	}	110	}
117		111
118	#define LIST_POISON1 ((void *) 0x00100100)	112	static inline void __list_del_entry(struct list_head *entry)
119	#define LIST_POISON2 ((void *) 0x00200200)	113	{
		114	__list_del(entry->prev, entry->next);
		115	}
		116
120	/**	117	/**
121	* list_del - deletes entry from list.	118	* list_del - deletes entry from list.
122	* @entry: the element to delete from the list.	119	* @entry: the element to delete from the list.
@@ -125,8 +122,135 @@ static inline void __list_del(struct list_head prev, struct list_head next) · 2 unmodified lines
125	*/	122	*/
126	static inline void list_del(struct list_head *entry)	123	static inline void list_del(struct list_head *entry)
127	{	124	{
128	__list_del(entry->prev, entry->next);	125	__list_del_entry(entry);
129	entry->next = (struct list_head*)LIST_POISON1;	126	entry->next = LIST_POISON1;
130	entry->prev = (struct list_head*)LIST_POISON2;	127	entry->prev = LIST_POISON2;
		128	}
		129
		130	/**
		131	* list_is_head - tests whether @list is the list @head
		132	* @list: the entry to test
		133	* @head: the head of the list
		134	*/
		135	static inline int list_is_head(const struct list_head list, const struct list_head head)
		136	{
		137	return list == head;
		138	}
		139
		140	/**
		141	* list_empty - tests whether a list is empty
		142	* @head: the list to test.
		143	*/
		144	static inline int list_empty(const struct list_head *head)
		145	{
		146	return head->next == head;
		147	}
		148
		149	/**
		150	* list_entry - get the struct for this entry
		151	* @ptr: the &struct list_head pointer.
		152	* @type: the type of the struct this is embedded in.
		153	* @member: the name of the list_head within the struct.
		154	*/
		155	#define list_entry(ptr, type, member) \
		156	container_of(ptr, type, member)
		157
		158	/**
		159	* list_first_entry - get the first element from a list
		160	* @ptr: the list head to take the element from.
		161	* @type: the type of the struct this is embedded in.
		162	* @member: the name of the list_head within the struct.
		163	*
		164	* Note, that list is expected to be not empty.
		165	*/
		166	#define list_first_entry(ptr, type, member) \
		167	list_entry((ptr)->next, type, member)
		168
		169	/**
		170	* list_next_entry - get the next element in list
		171	* @pos: the type * to cursor
		172	* @member: the name of the list_head within the struct.
		173	*/
		174	#define list_next_entry(pos, member) \
		175	list_entry((pos)->member.next, typeof(*(pos)), member)
		176
		177	/**
		178	* list_entry_is_head - test if the entry points to the head of the list
		179	* @pos: the type * to cursor
		180	* @head: the head for your list.
		181	* @member: the name of the list_head within the struct.
		182	*/
		183	#define list_entry_is_head(pos, head, member) \
		184	(&pos->member == (head))
		185
		186	/**
		187	* list_for_each_entry - iterate over list of given type
		188	* @pos: the type * to use as a loop cursor.
		189	* @head: the head for your list.
		190	* @member: the name of the list_head within the struct.
		191	*/
		192	#define list_for_each_entry(pos, head, member) \
		193	for (pos = list_first_entry(head, typeof(*pos), member); \
		194	!list_entry_is_head(pos, head, member); \
		195	pos = list_next_entry(pos, member))
		196
		197	/**
		198	* list_for_each_entry_safe - iterate over list of given type. Safe against removal of list entry
		199	* @pos: the type * to use as a loop cursor.
		200	* @n: another type * to use as temporary storage
		201	* @head: the head for your list.
		202	* @member: the name of the list_head within the struct.
		203	*/
		204	#define list_for_each_entry_safe(pos, n, head, member) \
		205	for (pos = list_first_entry(head, typeof(*pos), member), \
		206	n = list_next_entry(pos, member); \
		207	!list_entry_is_head(pos, head, member); \
		208	pos = n, n = list_next_entry(n, member))
		209
		210	/*
		211	* Double linked lists with a single pointer list head.
		212	* Mostly useful for hash tables where the two pointer list head is
		213	* too wasteful.
		214	* You lose the ability to access the tail in O(1).
		215	*/
		216
		217	#define HLIST_HEAD_INIT { .first = NULL }
		218
		219	/**
		220	* hlist_add_head - add a new entry at the beginning of the hlist
		221	* @n: new entry to be added
		222	* @h: hlist head to add it after
		223	*
		224	* Insert a new entry after the specified head.
		225	* This is good for implementing stacks.
		226	*/
		227	static inline void hlist_add_head(struct hlist_node n, struct hlist_head h)
		228	{
		229	struct hlist_node *first = h->first;
		230
		231	n->next = first;
		232	if (first)
		233	first->pprev = &n->next;
		234	h->first = n;
		235	n->pprev = &h->first;
131	}	236	}
132	#endif	237
		238	#define hlist_entry(ptr, type, member) container_of(ptr, type, member)
		239
		240	#define hlist_entry_safe(ptr, type, member) \
		241	({ typeof(ptr) ____ptr = (ptr); \
		242	____ptr ? hlist_entry(____ptr, type, member) : NULL; \
		243	})
		244
		245	/**
		246	* hlist_for_each_entry - iterate over list of given type
		247	* @pos: the type * to use as a loop cursor.
		248	* @head: the head for your list.
		249	* @member: the name of the hlist_node within the struct.
		250	*/
		251	#define hlist_for_each_entry(pos, head, member) \
		252	for (pos = hlist_entry_safe((head)->first, typeof(*(pos)), member);\
		253	pos; \
		254	pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
		255
		256	#endif /* LIST_H */

scripts/kconfig/list_types.h+17−0

@@ -0,0 +1,17 @@
	1	/* SPDX-License-Identifier: GPL-2.0 */
	2	#ifndef LIST_TYPES_H
	3	#define LIST_TYPES_H
	4
	5	struct list_head {
	6	struct list_head next, prev;
	7	};
	8
	9	struct hlist_head {
	10	struct hlist_node *first;
	11	};
	12
	13	struct hlist_node {
	14	struct hlist_node next, *pprev;
	15	};
	16
	17	#endif /* LIST_TYPES_H */

scripts/kconfig/lkc.h+3−3

 FILE *zconf_fopen(const char *name);
 void zconf_initscan(const char *name);
 void zconf_nextfile(const char *name);
-int zconf_lineno(void);
-const char *zconf_curname(void);
 /* confdata.c */
+extern struct gstr autoconf_cmd;
 const char *conf_get_configname(void);
 void set_all_choice_values(struct symbol *csym);
 }
 /* util.c */
-struct file *file_lookup(const char *name);
+unsigned int strhash(const char *s);
+const char *file_lookup(const char *name);
 void *xmalloc(size_t size);
 void *xcalloc(size_t nmemb, size_t size);
 void *xrealloc(void *p, size_t size);

scripts/kconfig/lkc_proto.h+0−15

@@ -18,8 +18,6 @@ void conf_set_message_callback(void (fn)(const char s)); · 17 unmodified lines
18	bool conf_errors(void);	18	bool conf_errors(void);
19		19
20	/* symbol.c */	20	/* symbol.c */
21	extern struct symbol * symbol_hash[SYMBOL_HASHSIZE];
22
23	struct symbol * sym_lookup(const char *name, int flags);	21	struct symbol * sym_lookup(const char *name, int flags);
24	struct symbol * sym_find(const char *name);	22	struct symbol * sym_find(const char *name);
25	void print_symbol_for_listconfig(struct symbol *sym);	23	void print_symbol_for_listconfig(struct symbol *sym);
@@ -40,19 +38,6 @@ const char * sym_get_string_value(struct symbol *sym); · 14 unmodified lines
40		38
41	const char * prop_get_type_name(enum prop_type type);	39	const char * prop_get_type_name(enum prop_type type);
42		40
43	/* preprocess.c */
44	enum variable_flavor {
45	VAR_SIMPLE,
46	VAR_RECURSIVE,
47	VAR_APPEND,
48	};
49	void env_write_dep(FILE f, const char auto_conf_name);
50	void variable_add(const char name, const char value,
51	enum variable_flavor flavor);
52	void variable_all_del(void);
53	char expand_dollar(const char *str);
54	char expand_one_token(const char *str);
55
56	/* expr.c */	41	/* expr.c */
57	void expr_print(struct expr e, void (fn)(void , struct symbol , const char ), void data, int prevtoken);	42	void expr_print(struct expr e, void (fn)(void , struct symbol , const char ), void data, int prevtoken);
58		43

scripts/kconfig/lxdialog/checklist.c+2−3

@@ -188,9 +188,8 @@ do_resize: · 187 unmodified lines
188		188
189	print_buttons(dialog, height, width, 0);	189	print_buttons(dialog, height, width, 0);
190		190
191	wnoutrefresh(dialog);	191	wmove(list, choice, check_x + 1);
192	wnoutrefresh(list);	192	wrefresh(list);
193	doupdate();
194		193
195	while (key != KEY_ESC) {	194	while (key != KEY_ESC) {
196	key = wgetch(dialog);	195	key = wgetch(dialog);

scripts/kconfig/lxdialog/dialog.h+0−4

 	struct dialog_color button_label_active;
 	struct dialog_color button_label_inactive;
 	struct dialog_color inputbox;
-	struct dialog_color inputbox_border;
-	struct dialog_color searchbox;
-	struct dialog_color searchbox_title;
-	struct dialog_color searchbox_border;
 	struct dialog_color position_indicator;
 	struct dialog_color menubox;
 	struct dialog_color menubox_border;

scripts/kconfig/lxdialog/util.c+1−19

 	dlg.button_label_active.atr = A_REVERSE;
 	dlg.button_label_inactive.atr = A_NORMAL;
 	dlg.inputbox.atr = A_NORMAL;
-	dlg.inputbox_border.atr = A_NORMAL;
-	dlg.searchbox.atr = A_NORMAL;
-	dlg.searchbox_title.atr = A_BOLD;
-	dlg.searchbox_border.atr = A_NORMAL;
 	dlg.position_indicator.atr = A_BOLD;
 	dlg.menubox.atr = A_NORMAL;
 	dlg.menubox_border.atr = A_NORMAL;
 	DLG_COLOR(button_label_active,   COLOR_YELLOW, COLOR_BLUE,   true);
 	DLG_COLOR(button_label_inactive, COLOR_BLACK,  COLOR_WHITE,  true);
 	DLG_COLOR(inputbox,              COLOR_BLACK,  COLOR_WHITE,  false);
-	DLG_COLOR(inputbox_border,       COLOR_BLACK,  COLOR_WHITE,  false);
-	DLG_COLOR(searchbox,             COLOR_BLACK,  COLOR_WHITE,  false);
-	DLG_COLOR(searchbox_title,       COLOR_YELLOW, COLOR_WHITE,  true);
-	DLG_COLOR(searchbox_border,      COLOR_WHITE,  COLOR_WHITE,  true);
 	DLG_COLOR(position_indicator,    COLOR_YELLOW, COLOR_WHITE,  true);
 	DLG_COLOR(menubox,               COLOR_BLACK,  COLOR_WHITE,  false);
 	DLG_COLOR(menubox_border,        COLOR_WHITE,  COLOR_WHITE,  true);
 	DLG_COLOR(button_key_active,     COLOR_YELLOW, COLOR_RED,   true);
 	DLG_COLOR(button_key_inactive,   COLOR_RED,    COLOR_BLACK, false);
 	DLG_COLOR(button_label_active,   COLOR_WHITE,  COLOR_RED,   false);
-	DLG_COLOR(button_label_inactive, COLOR_BLACK,  COLOR_BLACK, true);
+	DLG_COLOR(button_label_inactive, COLOR_WHITE,  COLOR_BLACK, false);
 	DLG_COLOR(inputbox,         COLOR_YELLOW, COLOR_BLACK, false);
-	DLG_COLOR(inputbox_border,  COLOR_YELLOW, COLOR_BLACK, false);
-	DLG_COLOR(searchbox,        COLOR_YELLOW, COLOR_BLACK, false);
-	DLG_COLOR(searchbox_title,  COLOR_YELLOW, COLOR_BLACK, true);
-	DLG_COLOR(searchbox_border, COLOR_BLACK,  COLOR_BLACK, true);
 	DLG_COLOR(position_indicator, COLOR_RED, COLOR_BLACK,  false);
 	DLG_COLOR(title,               COLOR_BLUE,   COLOR_WHITE, true);
 	DLG_COLOR(button_key_active,   COLOR_YELLOW, COLOR_BLUE,  true);
 	DLG_COLOR(button_label_active, COLOR_WHITE,  COLOR_BLUE,  true);
-	DLG_COLOR(searchbox_title,     COLOR_BLUE,   COLOR_WHITE, true);
 	DLG_COLOR(position_indicator,  COLOR_BLUE,   COLOR_WHITE, true);
 	DLG_COLOR(tag,                 COLOR_BLUE,   COLOR_WHITE, true);
 	DLG_COLOR(tag_key,             COLOR_BLUE,   COLOR_WHITE, true);
 	init_one_color(&dlg.button_label_active);
 	init_one_color(&dlg.button_label_inactive);
 	init_one_color(&dlg.inputbox);
-	init_one_color(&dlg.inputbox_border);
-	init_one_color(&dlg.searchbox);
-	init_one_color(&dlg.searchbox_title);
-	init_one_color(&dlg.searchbox_border);
 	init_one_color(&dlg.position_indicator);
 	init_one_color(&dlg.menubox);
 	init_one_color(&dlg.menubox_border);

scripts/kconfig/mconf.c+1−0

@@ -19,6 +19,7 @@ · 18 unmodified lines
19	#include <signal.h>	19	#include <signal.h>
20	#include <unistd.h>	20	#include <unistd.h>
21		21
		22	#include "list.h"
22	#include "lkc.h"	23	#include "lkc.h"
23	#include "lxdialog/dialog.h"	24	#include "lxdialog/dialog.h"
24	#include "mnconf-common.h"	25	#include "mnconf-common.h"

scripts/kconfig/menu.c+20−28

 #include "lkc.h"
 #include "internal.h"
+#include "list.h"
 static const char nohelp_text[] = "There is no help available for this option.";
 struct menu rootmenu;
 static struct menu **last_entry_ptr;
-struct file *file_list;
-struct file *current_file;
 void menu_warn(struct menu *menu, const char *fmt, ...)
 {
 	va_list ap;
 	va_start(ap, fmt);
-	fprintf(stderr, "%s:%d:warning: ", menu->file->name, menu->lineno);
+	fprintf(stderr, "%s:%d:warning: ", menu->filename, menu->lineno);
 	vfprintf(stderr, fmt, ap);
 	fprintf(stderr, "\n");
 	va_end(ap);
 {
 	va_list ap;
 	va_start(ap, fmt);
-	fprintf(stderr, "%s:%d:warning: ", prop->file->name, prop->lineno);
+	fprintf(stderr, "%s:%d:warning: ", prop->filename, prop->lineno);
 	vfprintf(stderr, fmt, ap);
 	fprintf(stderr, "\n");
 	va_end(ap);
 	memset(menu, 0, sizeof(*menu));
 	menu->sym = sym;
 	menu->parent = current_menu;
-	menu->file = current_file;
+	menu->filename = cur_filename;
-	menu->lineno = zconf_lineno();
+	menu->lineno = cur_lineno;
 	*last_entry_ptr = menu;
 	last_entry_ptr = &menu->next;
 	current_entry = menu;
-	if (sym)
+	if (sym) {
 		menu_add_symbol(P_SYMBOL, sym, NULL);
+		list_add_tail(&menu->link, &sym->menus);
+	}
 }
 struct menu *menu_add_menu(void)
 	prop = xmalloc(sizeof(*prop));
 	memset(prop, 0, sizeof(*prop));
 	prop->type = type;
-	prop->file = current_file;
+	prop->filename = cur_filename;
-	prop->lineno = zconf_lineno();
+	prop->lineno = cur_lineno;
 	prop->menu = current_entry;
 	prop->expr = expr;
 	prop->visible.expr = dep;
 					}
 				}
 			}
-			/* set the type of the remaining choice values */
-			for (menu = parent->list; menu; menu = menu->next) {
-				current_entry = menu;
-				if (menu->sym && menu->sym->type == S_UNKNOWN)
-					menu_set_type(sym->type);
-			}
 			/*
 			 * Use the choice itself as the parent dependency of
 		if (sym->type == S_UNKNOWN)
 			menu_warn(parent, "config symbol defined without type");
-		if (sym_is_choice(sym) && !parent->prompt)
-			menu_warn(parent, "choice must have a prompt");
 		/* Check properties connected to this symbol */
 		sym_check_prop(sym);
 		sym->flags |= SYMBOL_WARNED;
 static void get_def_str(struct gstr *r, struct menu *menu)
 {
 	str_printf(r, "Defined at %s:%d\n",
-		   menu->file->name, menu->lineno);
+		   menu->filename, menu->lineno);
 }
 static void get_dep_str(struct gstr *r, struct expr *expr, const char *prefix)
 		    struct list_head *head)
 {
 	struct property *prop;
+	struct menu *menu;
 	if (sym && sym->name) {
 		str_printf(r, "Symbol: %s [=%s]\n", sym->name,
 	}
 	/* Print the definitions with prompts before the ones without */
-	for_all_properties(sym, prop, P_SYMBOL) {
+	list_for_each_entry(menu, &sym->menus, link) {
-		if (prop->menu->prompt) {
+		if (menu->prompt) {
-			get_def_str(r, prop->menu);
+			get_def_str(r, menu);
-			get_prompt_str(r, prop->menu->prompt, head);
+			get_prompt_str(r, menu->prompt, head);
 		}
 	}
-	for_all_properties(sym, prop, P_SYMBOL) {
+	list_for_each_entry(menu, &sym->menus, link) {
-		if (!prop->menu->prompt) {
+		if (!menu->prompt) {
-			get_def_str(r, prop->menu);
+			get_def_str(r, menu);
-			get_dep_str(r, prop->menu->dep, "  Depends on: ");
+			get_dep_str(r, menu->dep, "  Depends on: ");
 		}
 	}

scripts/kconfig/nconf.c+1−0

@@ -11,6 +11,7 @@ · 10 unmodified lines
11	#include <strings.h>	11	#include <strings.h>
12	#include <stdlib.h>	12	#include <stdlib.h>
13		13
		14	#include "list.h"
14	#include "lkc.h"	15	#include "lkc.h"
15	#include "mnconf-common.h"	16	#include "mnconf-common.h"
16	#include "nconf.h"	17	#include "nconf.h"

scripts/kconfig/parser.y+76−49

@@ -13,6 +13,7 @@ · 12 unmodified lines
13		13
14	#include "lkc.h"	14	#include "lkc.h"
15	#include "internal.h"	15	#include "internal.h"
		16	#include "preprocess.h"
16		17
17	#define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt)	18	#define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt)
18		19
@@ -27,8 +28,6 @@ static void zconf_error(const char *err, ...); · 8 unmodified lines
27	static bool zconf_endtoken(const char *tokenname,	28	static bool zconf_endtoken(const char *tokenname,
28	const char *expected_tokenname);	29	const char *expected_tokenname);
29		30
30	struct symbol *symbol_hash[SYMBOL_HASHSIZE];
31
32	struct menu current_menu, current_entry;	31	struct menu current_menu, current_entry;
33		32
34	%}	33	%}
@@ -95,12 +94,12 @@ struct menu current_menu, current_entry; · 60 unmodified lines
95	%type <expr> if_expr	94	%type <expr> if_expr
96	%type <string> end	95	%type <string> end
97	%type <menu> if_entry menu_entry choice_entry	96	%type <menu> if_entry menu_entry choice_entry
98	%type <string> word_opt assign_val	97	%type <string> assign_val
99	%type <flavor> assign_op	98	%type <flavor> assign_op
100		99
101	%destructor {	100	%destructor {
102	fprintf(stderr, "%s:%d: missing end statement for this entry\n",	101	fprintf(stderr, "%s:%d: missing end statement for this entry\n",
103	$$->file->name, $$->lineno);	102	$$->filename, $$->lineno);
104	if (current_menu == $$)	103	if (current_menu == $$)
105	menu_end_menu();	104	menu_end_menu();
106	} if_entry menu_entry choice_entry	105	} if_entry menu_entry choice_entry
@@ -143,19 +142,19 @@ config_entry_start: T_CONFIG nonconst_symbol T_EOL · 36 unmodified lines
143	{	142	{
144	$2->flags \|= SYMBOL_OPTIONAL;	143	$2->flags \|= SYMBOL_OPTIONAL;
145	menu_add_entry($2);	144	menu_add_entry($2);
146	printd(DEBUG_PARSE, "%s:%d:config %s\n", zconf_curname(), zconf_lineno(), $2->name);	145	printd(DEBUG_PARSE, "%s:%d:config %s\n", cur_filename, cur_lineno, $2->name);
147	};	146	};
148		147
149	config_stmt: config_entry_start config_option_list	148	config_stmt: config_entry_start config_option_list
150	{	149	{
151	printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());	150	printd(DEBUG_PARSE, "%s:%d:endconfig\n", cur_filename, cur_lineno);
152	};	151	};
153		152
154	menuconfig_entry_start: T_MENUCONFIG nonconst_symbol T_EOL	153	menuconfig_entry_start: T_MENUCONFIG nonconst_symbol T_EOL
155	{	154	{
156	$2->flags \|= SYMBOL_OPTIONAL;	155	$2->flags \|= SYMBOL_OPTIONAL;
157	menu_add_entry($2);	156	menu_add_entry($2);
158	printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", zconf_curname(), zconf_lineno(), $2->name);	157	printd(DEBUG_PARSE, "%s:%d:menuconfig %s\n", cur_filename, cur_lineno, $2->name);
159	};	158	};
160		159
161	menuconfig_stmt: menuconfig_entry_start config_option_list	160	menuconfig_stmt: menuconfig_entry_start config_option_list
@@ -164,7 +163,7 @@ menuconfig_stmt: menuconfig_entry_start config_option_list · 2 unmodified lines
164	current_entry->prompt->type = P_MENU;	163	current_entry->prompt->type = P_MENU;
165	else	164	else
166	zconfprint("warning: menuconfig statement without prompt");	165	zconfprint("warning: menuconfig statement without prompt");
167	printd(DEBUG_PARSE, "%s:%d:endconfig\n", zconf_curname(), zconf_lineno());	166	printd(DEBUG_PARSE, "%s:%d:endconfig\n", cur_filename, cur_lineno);
168	};	167	};
169		168
170	config_option_list:	169	config_option_list:
@@ -177,15 +176,13 @@ config_option_list: · 6 unmodified lines
177	config_option: type prompt_stmt_opt T_EOL	176	config_option: type prompt_stmt_opt T_EOL
178	{	177	{
179	menu_set_type($1);	178	menu_set_type($1);
180	printd(DEBUG_PARSE, "%s:%d:type(%u)\n",	179	printd(DEBUG_PARSE, "%s:%d:type(%u)\n", cur_filename, cur_lineno, $1);
181	zconf_curname(), zconf_lineno(),
182	$1);
183	};	180	};
184		181
185	config_option: T_PROMPT T_WORD_QUOTE if_expr T_EOL	182	config_option: T_PROMPT T_WORD_QUOTE if_expr T_EOL
186	{	183	{
187	menu_add_prompt(P_PROMPT, $2, $3);	184	menu_add_prompt(P_PROMPT, $2, $3);
188	printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());	185	printd(DEBUG_PARSE, "%s:%d:prompt\n", cur_filename, cur_lineno);
189	};	186	};
190		187
191	config_option: default expr if_expr T_EOL	188	config_option: default expr if_expr T_EOL
@@ -193,27 +190,26 @@ config_option: default expr if_expr T_EOL · 1 unmodified line
193	menu_add_expr(P_DEFAULT, $2, $3);	190	menu_add_expr(P_DEFAULT, $2, $3);
194	if ($1 != S_UNKNOWN)	191	if ($1 != S_UNKNOWN)
195	menu_set_type($1);	192	menu_set_type($1);
196	printd(DEBUG_PARSE, "%s:%d:default(%u)\n",	193	printd(DEBUG_PARSE, "%s:%d:default(%u)\n", cur_filename, cur_lineno,
197	zconf_curname(), zconf_lineno(),
198	$1);	194	$1);
199	};	195	};
200		196
201	config_option: T_SELECT nonconst_symbol if_expr T_EOL	197	config_option: T_SELECT nonconst_symbol if_expr T_EOL
202	{	198	{
203	menu_add_symbol(P_SELECT, $2, $3);	199	menu_add_symbol(P_SELECT, $2, $3);
204	printd(DEBUG_PARSE, "%s:%d:select\n", zconf_curname(), zconf_lineno());	200	printd(DEBUG_PARSE, "%s:%d:select\n", cur_filename, cur_lineno);
205	};	201	};
206		202
207	config_option: T_IMPLY nonconst_symbol if_expr T_EOL	203	config_option: T_IMPLY nonconst_symbol if_expr T_EOL
208	{	204	{
209	menu_add_symbol(P_IMPLY, $2, $3);	205	menu_add_symbol(P_IMPLY, $2, $3);
210	printd(DEBUG_PARSE, "%s:%d:imply\n", zconf_curname(), zconf_lineno());	206	printd(DEBUG_PARSE, "%s:%d:imply\n", cur_filename, cur_lineno);
211	};	207	};
212		208
213	config_option: T_RANGE symbol symbol if_expr T_EOL	209	config_option: T_RANGE symbol symbol if_expr T_EOL
214	{	210	{
215	menu_add_expr(P_RANGE, expr_alloc_comp(E_RANGE,$2, $3), $4);	211	menu_add_expr(P_RANGE, expr_alloc_comp(E_RANGE,$2, $3), $4);
216	printd(DEBUG_PARSE, "%s:%d:range\n", zconf_curname(), zconf_lineno());	212	printd(DEBUG_PARSE, "%s:%d:range\n", cur_filename, cur_lineno);
217	};	213	};
218		214
219	config_option: T_MODULES T_EOL	215	config_option: T_MODULES T_EOL
@@ -226,18 +222,23 @@ config_option: T_MODULES T_EOL · 6 unmodified lines
226		222
227	/* choice entry */	223	/* choice entry */
228		224
229	choice: T_CHOICE word_opt T_EOL	225	choice: T_CHOICE T_EOL
230	{	226	{
231	struct symbol *sym = sym_lookup($2, SYMBOL_CHOICE);	227	struct symbol *sym = sym_lookup(NULL, SYMBOL_CHOICE);
232	sym->flags \|= SYMBOL_NO_WRITE;	228	sym->flags \|= SYMBOL_NO_WRITE;
233	menu_add_entry(sym);	229	menu_add_entry(sym);
234	menu_add_expr(P_CHOICE, NULL, NULL);	230	menu_add_expr(P_CHOICE, NULL, NULL);
235	free($2);	231	printd(DEBUG_PARSE, "%s:%d:choice\n", cur_filename, cur_lineno);
236	printd(DEBUG_PARSE, "%s:%d:choice\n", zconf_curname(), zconf_lineno());
237	};	232	};
238		233
239	choice_entry: choice choice_option_list	234	choice_entry: choice choice_option_list
240	{	235	{
		236	if (!current_entry->prompt) {
		237	fprintf(stderr, "%s:%d: error: choice must have a prompt\n",
		238	current_entry->filename, current_entry->lineno);
		239	yynerrs++;
		240	}
		241
241	$$ = menu_add_menu();	242	$$ = menu_add_menu();
242	};	243	};
243		244
@@ -245,7 +246,7 @@ choice_end: end · 1 unmodified line
245	{	246	{
246	if (zconf_endtoken($1, "choice")) {	247	if (zconf_endtoken($1, "choice")) {
247	menu_end_menu();	248	menu_end_menu();
248	printd(DEBUG_PARSE, "%s:%d:endchoice\n", zconf_curname(), zconf_lineno());	249	printd(DEBUG_PARSE, "%s:%d:endchoice\n", cur_filename, cur_lineno);
249	}	250	}
250	};	251	};
251		252
@@ -262,27 +263,25 @@ choice_option_list: · 10 unmodified lines
262	choice_option: T_PROMPT T_WORD_QUOTE if_expr T_EOL	263	choice_option: T_PROMPT T_WORD_QUOTE if_expr T_EOL
263	{	264	{
264	menu_add_prompt(P_PROMPT, $2, $3);	265	menu_add_prompt(P_PROMPT, $2, $3);
265	printd(DEBUG_PARSE, "%s:%d:prompt\n", zconf_curname(), zconf_lineno());	266	printd(DEBUG_PARSE, "%s:%d:prompt\n", cur_filename, cur_lineno);
266	};	267	};
267		268
268	choice_option: logic_type prompt_stmt_opt T_EOL	269	choice_option: logic_type prompt_stmt_opt T_EOL
269	{	270	{
270	menu_set_type($1);	271	menu_set_type($1);
271	printd(DEBUG_PARSE, "%s:%d:type(%u)\n",	272	printd(DEBUG_PARSE, "%s:%d:type(%u)\n", cur_filename, cur_lineno, $1);
272	zconf_curname(), zconf_lineno(), $1);
273	};	273	};
274		274
275	choice_option: T_OPTIONAL T_EOL	275	choice_option: T_OPTIONAL T_EOL
276	{	276	{
277	current_entry->sym->flags \|= SYMBOL_OPTIONAL;	277	current_entry->sym->flags \|= SYMBOL_OPTIONAL;
278	printd(DEBUG_PARSE, "%s:%d:optional\n", zconf_curname(), zconf_lineno());	278	printd(DEBUG_PARSE, "%s:%d:optional\n", cur_filename, cur_lineno);
279	};	279	};
280		280
281	choice_option: T_DEFAULT nonconst_symbol if_expr T_EOL	281	choice_option: T_DEFAULT nonconst_symbol if_expr T_EOL
282	{	282	{
283	menu_add_symbol(P_DEFAULT, $2, $3);	283	menu_add_symbol(P_DEFAULT, $2, $3);
284	printd(DEBUG_PARSE, "%s:%d:default\n",	284	printd(DEBUG_PARSE, "%s:%d:default\n", cur_filename, cur_lineno);
285	zconf_curname(), zconf_lineno());
286	};	285	};
287		286
288	type:	287	type:
@@ -304,7 +303,7 @@ default: · 15 unmodified lines
304		303
305	if_entry: T_IF expr T_EOL	304	if_entry: T_IF expr T_EOL
306	{	305	{
307	printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());	306	printd(DEBUG_PARSE, "%s:%d:if\n", cur_filename, cur_lineno);
308	menu_add_entry(NULL);	307	menu_add_entry(NULL);
309	menu_add_dep($2);	308	menu_add_dep($2);
310	$$ = menu_add_menu();	309	$$ = menu_add_menu();
@@ -314,7 +313,7 @@ if_end: end · 3 unmodified lines
314	{	313	{
315	if (zconf_endtoken($1, "if")) {	314	if (zconf_endtoken($1, "if")) {
316	menu_end_menu();	315	menu_end_menu();
317	printd(DEBUG_PARSE, "%s:%d:endif\n", zconf_curname(), zconf_lineno());	316	printd(DEBUG_PARSE, "%s:%d:endif\n", cur_filename, cur_lineno);
318	}	317	}
319	};	318	};
320		319
@@ -330,7 +329,7 @@ menu: T_MENU T_WORD_QUOTE T_EOL · 9 unmodified lines
330	{	329	{
331	menu_add_entry(NULL);	330	menu_add_entry(NULL);
332	menu_add_prompt(P_MENU, $2, NULL);	331	menu_add_prompt(P_MENU, $2, NULL);
333	printd(DEBUG_PARSE, "%s:%d:menu\n", zconf_curname(), zconf_lineno());	332	printd(DEBUG_PARSE, "%s:%d:menu\n", cur_filename, cur_lineno);
334	};	333	};
335		334
336	menu_entry: menu menu_option_list	335	menu_entry: menu menu_option_list
@@ -342,7 +341,7 @@ menu_end: end · 5 unmodified lines
342	{	341	{
343	if (zconf_endtoken($1, "menu")) {	342	if (zconf_endtoken($1, "menu")) {
344	menu_end_menu();	343	menu_end_menu();
345	printd(DEBUG_PARSE, "%s:%d:endmenu\n", zconf_curname(), zconf_lineno());	344	printd(DEBUG_PARSE, "%s:%d:endmenu\n", cur_filename, cur_lineno);
346	}	345	}
347	};	346	};
348		347
@@ -357,7 +356,7 @@ menu_option_list: · 8 unmodified lines
357		356
358	source_stmt: T_SOURCE T_WORD_QUOTE T_EOL	357	source_stmt: T_SOURCE T_WORD_QUOTE T_EOL
359	{	358	{
360	printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), $2);	359	printd(DEBUG_PARSE, "%s:%d:source %s\n", cur_filename, cur_lineno, $2);
361	zconf_nextfile($2);	360	zconf_nextfile($2);
362	free($2);	361	free($2);
363	};	362	};
@@ -368,7 +367,7 @@ comment: T_COMMENT T_WORD_QUOTE T_EOL · 4 unmodified lines
368	{	367	{
369	menu_add_entry(NULL);	368	menu_add_entry(NULL);
370	menu_add_prompt(P_COMMENT, $2, NULL);	369	menu_add_prompt(P_COMMENT, $2, NULL);
371	printd(DEBUG_PARSE, "%s:%d:comment\n", zconf_curname(), zconf_lineno());	370	printd(DEBUG_PARSE, "%s:%d:comment\n", cur_filename, cur_lineno);
372	};	371	};
373		372
374	comment_stmt: comment comment_option_list	373	comment_stmt: comment comment_option_list
@@ -383,7 +382,7 @@ comment_option_list: · 8 unmodified lines
383		382
384	help_start: T_HELP T_EOL	383	help_start: T_HELP T_EOL
385	{	384	{
386	printd(DEBUG_PARSE, "%s:%d:help\n", zconf_curname(), zconf_lineno());	385	printd(DEBUG_PARSE, "%s:%d:help\n", cur_filename, cur_lineno);
387	zconf_starthelp();	386	zconf_starthelp();
388	};	387	};
389		388
@@ -408,7 +407,7 @@ help: help_start T_HELPTEXT · 18 unmodified lines
408	depends: T_DEPENDS T_ON expr T_EOL	407	depends: T_DEPENDS T_ON expr T_EOL
409	{	408	{
410	menu_add_dep($3);	409	menu_add_dep($3);
411	printd(DEBUG_PARSE, "%s:%d:depends on\n", zconf_curname(), zconf_lineno());	410	printd(DEBUG_PARSE, "%s:%d:depends on\n", cur_filename, cur_lineno);
412	};	411	};
413		412
414	/* visibility option */	413	/* visibility option */
@@ -455,9 +454,6 @@ symbol: nonconst_symbol · 40 unmodified lines
455	\| T_WORD_QUOTE { $$ = sym_lookup($1, SYMBOL_CONST); free($1); }	454	\| T_WORD_QUOTE { $$ = sym_lookup($1, SYMBOL_CONST); free($1); }
456	;	455	;
457		456
458	word_opt: /* empty */ { $$ = NULL; }
459	\| T_WORD
460
461	/* assignment statement */	457	/* assignment statement */
462		458
463	assignment_stmt: T_WORD assign_op assign_val T_EOL { variable_add($1, $3, $2); free($1); free($3); }	459	assignment_stmt: T_WORD assign_op assign_val T_EOL { variable_add($1, $3, $2); free($1); free($3); }
@@ -477,8 +473,11 @@ assign_val: · 13 unmodified lines
477		473
478	void conf_parse(const char *name)	474	void conf_parse(const char *name)
479	{	475	{
480	struct symbol *sym;	476	struct menu *menu;
481	int i;	477
		478	autoconf_cmd = str_new();
		479
		480	str_printf(&autoconf_cmd, "\ndeps_config := \\\n");
482		481
483	zconf_initscan(name);	482	zconf_initscan(name);
484		483
@@ -488,13 +487,28 @@ void conf_parse(const char *name) · 3 unmodified lines
488	yydebug = 1;	487	yydebug = 1;
489	yyparse();	488	yyparse();
490		489
		490	/*
		491	* FIXME:
		492	* cur_filename and cur_lineno are used even after yyparse();
		493	* menu_finalize() calls menu_add_symbol(). This should be fixed.
		494	*/
		495	cur_filename = "<none>";
		496	cur_lineno = 0;
		497
		498	str_printf(&autoconf_cmd,
		499	"\n"
		500	"$(autoconfig): $(deps_config)\n"
		501	"$(deps_config): ;\n");
		502
		503	env_write_dep(&autoconf_cmd);
		504
491	/* Variables are expanded in the parse phase. We can free them here. */	505	/* Variables are expanded in the parse phase. We can free them here. */
492	variable_all_del();	506	variable_all_del();
493		507
494	if (yynerrs)	508	if (yynerrs)
495	exit(1);	509	exit(1);
496	if (!modules_sym)	510	if (!modules_sym)
497	modules_sym = sym_find( "n" );	511	modules_sym = &symbol_no;
498		512
499	if (!menu_has_prompt(&rootmenu)) {	513	if (!menu_has_prompt(&rootmenu)) {
500	current_entry = &rootmenu;	514	current_entry = &rootmenu;
@@ -502,10 +516,23 @@ void conf_parse(const char *name) · 1 unmodified line
502	}	516	}
503		517
504	menu_finalize(&rootmenu);	518	menu_finalize(&rootmenu);
505	for_all_symbols(i, sym) {	519
506	if (sym_check_deps(sym))	520	menu = &rootmenu;
		521	while (menu) {
		522	if (menu->sym && sym_check_deps(menu->sym))
507	yynerrs++;	523	yynerrs++;
		524
		525	if (menu->list) {
		526	menu = menu->list;
		527	continue;
		528	}
		529
		530	while (!menu->next && menu->parent)
		531	menu = menu->parent;
		532
		533	menu = menu->next;
508	}	534	}
		535
509	if (yynerrs)	536	if (yynerrs)
510	exit(1);	537	exit(1);
511	conf_set_changed(true);	538	conf_set_changed(true);
@@ -520,11 +547,11 @@ static bool zconf_endtoken(const char *tokenname, · 8 unmodified lines
520	yynerrs++;	547	yynerrs++;
521	return false;	548	return false;
522	}	549	}
523	if (current_menu->file != current_file) {	550	if (strcmp(current_menu->filename, cur_filename)) {
524	zconf_error("'%s' in different file than '%s'",	551	zconf_error("'%s' in different file than '%s'",
525	tokenname, expected_tokenname);	552	tokenname, expected_tokenname);
526	fprintf(stderr, "%s:%d: location of the '%s'\n",	553	fprintf(stderr, "%s:%d: location of the '%s'\n",
527	current_menu->file->name, current_menu->lineno,	554	current_menu->filename, current_menu->lineno,
528	expected_tokenname);	555	expected_tokenname);
529	yynerrs++;	556	yynerrs++;
530	return false;	557	return false;
@@ -536,7 +563,7 @@ static void zconfprint(const char *err, ...) · 5 unmodified lines
536	{	563	{
537	va_list ap;	564	va_list ap;
538		565
539	fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno());	566	fprintf(stderr, "%s:%d: ", cur_filename, cur_lineno);
540	va_start(ap, err);	567	va_start(ap, err);
541	vfprintf(stderr, err, ap);	568	vfprintf(stderr, err, ap);
542	va_end(ap);	569	va_end(ap);
@@ -548,7 +575,7 @@ static void zconf_error(const char *err, ...) · 5 unmodified lines
548	va_list ap;	575	va_list ap;
549		576
550	yynerrs++;	577	yynerrs++;
551	fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno());	578	fprintf(stderr, "%s:%d: ", cur_filename, cur_lineno);
552	va_start(ap, err);	579	va_start(ap, err);
553	vfprintf(stderr, err, ap);	580	vfprintf(stderr, err, ap);
554	va_end(ap);	581	va_end(ap);
@@ -557,7 +584,7 @@ static void zconf_error(const char *err, ...) · 2 unmodified lines
557		584
558	static void yyerror(const char *err)	585	static void yyerror(const char *err)
559	{	586	{
560	fprintf(stderr, "%s:%d: %s\n", zconf_curname(), zconf_lineno() + 1, err);	587	fprintf(stderr, "%s:%d: %s\n", cur_filename, cur_lineno, err);
561	}	588	}
562		589
563	static void print_quoted_string(FILE out, const char str)	590	static void print_quoted_string(FILE out, const char str)

scripts/kconfig/preprocess.c+13−10

@@ -9,10 +9,11 @@ · 8 unmodified lines
9	#include <stdlib.h>	9	#include <stdlib.h>
10	#include <string.h>	10	#include <string.h>
11		11
		12	#include "array_size.h"
		13	#include "internal.h"
12	#include "list.h"	14	#include "list.h"
13	#include "lkc.h"	15	#include "lkc.h"
14		16	#include "preprocess.h"
15	#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
16		17
17	static char expand_string_with_args(const char in, int argc, char *argv[]);	18	static char expand_string_with_args(const char in, int argc, char *argv[]);
18	static char expand_string(const char in);	19	static char expand_string(const char in);
@@ -21,7 +22,7 @@ static void __attribute__((noreturn)) pperror(const char *format, ...) · 2 unmodified lines
21	{	22	{
22	va_list ap;	23	va_list ap;
23		24
24	fprintf(stderr, "%s:%d: ", current_file->name, yylineno);	25	fprintf(stderr, "%s:%d: ", cur_filename, yylineno);
25	va_start(ap, format);	26	va_start(ap, format);
26	vfprintf(stderr, format, ap);	27	vfprintf(stderr, format, ap);
27	va_end(ap);	28	va_end(ap);
@@ -87,14 +88,17 @@ static char env_expand(const char name) · 59 unmodified lines
87	return xstrdup(value);	88	return xstrdup(value);
88	}	89	}
89		90
90	void env_write_dep(FILE f, const char autoconfig_name)	91	void env_write_dep(struct gstr *s)
91	{	92	{
92	struct env e, tmp;	93	struct env e, tmp;
93		94
94	list_for_each_entry_safe(e, tmp, &env_list, node) {	95	list_for_each_entry_safe(e, tmp, &env_list, node) {
95	fprintf(f, "ifneq \"$(%s)\" \"%s\"\n", e->name, e->value);	96	str_printf(s,
96	fprintf(f, "%s: FORCE\n", autoconfig_name);	97	"\n"
97	fprintf(f, "endif\n");	98	"ifneq \"$(%s)\" \"%s\"\n"
		99	"$(autoconfig): FORCE\n"
		100	"endif\n",
		101	e->name, e->value);
98	env_del(e);	102	env_del(e);
99	}	103	}
100	}	104	}
@@ -119,7 +123,7 @@ static char do_error_if(int argc, char argv[]) · 18 unmodified lines
119		123
120	static char do_filename(int argc, char argv[])	124	static char do_filename(int argc, char argv[])
121	{	125	{
122	return xstrdup(current_file->name);	126	return xstrdup(cur_filename);
123	}	127	}
124		128
125	static char do_info(int argc, char argv[])	129	static char do_info(int argc, char argv[])
@@ -181,8 +185,7 @@ static char do_shell(int argc, char argv[]) · 55 unmodified lines
181	static char do_warning_if(int argc, char argv[])	185	static char do_warning_if(int argc, char argv[])
182	{	186	{
183	if (!strcmp(argv[0], "y"))	187	if (!strcmp(argv[0], "y"))
184	fprintf(stderr, "%s:%d: %s\n",	188	fprintf(stderr, "%s:%d: %s\n", cur_filename, yylineno, argv[1]);
185	current_file->name, yylineno, argv[1]);
186		189
187	return xstrdup("");	190	return xstrdup("");
188	}	191	}

scripts/kconfig/preprocess.h+19−0

@@ -0,0 +1,19 @@
	1	/* SPDX-License-Identifier: GPL-2.0-only */
	2	#ifndef PREPROCESS_H
	3	#define PREPROCESS_H
	4
	5	enum variable_flavor {
	6	VAR_SIMPLE,
	7	VAR_RECURSIVE,
	8	VAR_APPEND,
	9	};
	10
	11	struct gstr;
	12	void env_write_dep(struct gstr *gs);
	13	void variable_add(const char name, const char value,
	14	enum variable_flavor flavor);
	15	void variable_all_del(void);
	16	char expand_dollar(const char *str);
	17	char expand_one_token(const char *str);
	18
	19	#endif /* PREPROCESS_H */

scripts/kconfig/qconf.cc+1−1

@@ -1058,7 +1058,7 @@ void ConfigInfoView::menuInfo(void) · 1057 unmodified lines
1058	stream << "<br><br>";	1058	stream << "<br><br>";
1059	}	1059	}
1060		1060
1061	stream << "defined at " << _menu->file->name << ":"	1061	stream << "defined at " << _menu->filename << ":"
1062	<< _menu->lineno << "<br><br>";	1062	<< _menu->lineno << "<br><br>";
1063	}	1063	}
1064	}	1064	}

scripts/kconfig/symbol.c+22−27

 #include <string.h>
 #include <regex.h>
+#include "internal.h"
 #include "lkc.h"
 struct symbol symbol_yes = {
 	.name = "y",
 	.curr = { "y", yes },
+	.menus = LIST_HEAD_INIT(symbol_yes.menus),
 	.flags = SYMBOL_CONST|SYMBOL_VALID,
 };
 struct symbol symbol_mod = {
 	.name = "m",
 	.curr = { "m", mod },
+	.menus = LIST_HEAD_INIT(symbol_mod.menus),
 	.flags = SYMBOL_CONST|SYMBOL_VALID,
 };
 struct symbol symbol_no = {
 	.name = "n",
 	.curr = { "n", no },
+	.menus = LIST_HEAD_INIT(symbol_no.menus),
 	.flags = SYMBOL_CONST|SYMBOL_VALID,
 };
 static void sym_set_all_changed(void)
 {
 	struct symbol *sym;
-	int i;
-	for_all_symbols(i, sym)
+	for_all_symbols(sym)
 		sym_set_changed(sym);
 }
 void sym_clear_all_valid(void)
 {
 	struct symbol *sym;
-	int i;
-	for_all_symbols(i, sym)
+	for_all_symbols(sym)
 		sym->flags &= ~SYMBOL_VALID;
 	conf_set_changed(true);
 	sym_calc_value(modules_sym);
 	return sym->visible > sym->rev_dep.tri;
 }
-static unsigned strhash(const char *s)
+HASHTABLE_DEFINE(sym_hashtable, SYMBOL_HASHSIZE);
-{
-	/* fnv32 hash */
-	unsigned hash = 2166136261U;
-	for (; *s; s++)
-		hash = (hash ^ *s) * 0x01000193;
-	return hash;
-}
 struct symbol *sym_lookup(const char *name, int flags)
 {
 			case 'n': return &symbol_no;
 			}
 		}
-		hash = strhash(name) % SYMBOL_HASHSIZE;
+		hash = strhash(name);
-		for (symbol = symbol_hash[hash]; symbol; symbol = symbol->next) {
+		hash_for_each_possible(sym_hashtable, symbol, node, hash) {
 			if (symbol->name &&
 			    !strcmp(symbol->name, name) &&
 			    (flags ? symbol->flags & flags
 	symbol->name = new_name;
 	symbol->type = S_UNKNOWN;
 	symbol->flags = flags;
+	INIT_LIST_HEAD(&symbol->menus);
-	symbol->next = symbol_hash[hash];
+	hash_add(sym_hashtable, &symbol->node, hash);
-	symbol_hash[hash] = symbol;
 	return symbol;
 }
 		case 'n': return &symbol_no;
 		}
 	}
-	hash = strhash(name) % SYMBOL_HASHSIZE;
+	hash = strhash(name);
-	for (symbol = symbol_hash[hash]; symbol; symbol = symbol->next) {
+	hash_for_each_possible(sym_hashtable, symbol, node, hash) {
 		if (symbol->name &&
 		    !strcmp(symbol->name, name) &&
 		    !(symbol->flags & SYMBOL_CONST))
 	if (regcomp(&re, pattern, REG_EXTENDED|REG_ICASE))
 		return NULL;
-	for_all_symbols(i, sym) {
+	for_all_symbols(sym) {
 		if (sym->flags & SYMBOL_CONST || !sym->name)
 			continue;
 		if (regexec(&re, sym->name, 1, match, 0))
 		}
 		if (stack->sym == last_sym)
 			fprintf(stderr, "%s:%d:error: recursive dependency detected!\n",
-				prop->file->name, prop->lineno);
+				prop->filename, prop->lineno);
 		if (sym_is_choice(sym)) {
 			fprintf(stderr, "%s:%d:\tchoice %s contains symbol %s\n",
-				menu->file->name, menu->lineno,
+				menu->filename, menu->lineno,
 				sym->name ? sym->name : "<choice>",
 				next_sym->name ? next_sym->name : "<choice>");
 		} else if (sym_is_choice_value(sym)) {
 			fprintf(stderr, "%s:%d:\tsymbol %s is part of choice %s\n",
-				menu->file->name, menu->lineno,
+				menu->filename, menu->lineno,
 				sym->name ? sym->name : "<choice>",
 				next_sym->name ? next_sym->name : "<choice>");
 		} else if (stack->expr == &sym->dir_dep.expr) {
 			fprintf(stderr, "%s:%d:\tsymbol %s depends on %s\n",
-				prop->file->name, prop->lineno,
+				prop->filename, prop->lineno,
 				sym->name ? sym->name : "<choice>",
 				next_sym->name ? next_sym->name : "<choice>");
 		} else if (stack->expr == &sym->rev_dep.expr) {
 			fprintf(stderr, "%s:%d:\tsymbol %s is selected by %s\n",
-				prop->file->name, prop->lineno,
+				prop->filename, prop->lineno,
 				sym->name ? sym->name : "<choice>",
 				next_sym->name ? next_sym->name : "<choice>");
 		} else if (stack->expr == &sym->implied.expr) {
 			fprintf(stderr, "%s:%d:\tsymbol %s is implied by %s\n",
-				prop->file->name, prop->lineno,
+				prop->filename, prop->lineno,
 				sym->name ? sym->name : "<choice>",
 				next_sym->name ? next_sym->name : "<choice>");
 		} else if (stack->expr) {
 			fprintf(stderr, "%s:%d:\tsymbol %s %s value contains %s\n",
-				prop->file->name, prop->lineno,
+				prop->filename, prop->lineno,
 				sym->name ? sym->name : "<choice>",
 				prop_get_type_name(prop->type),
 				next_sym->name ? next_sym->name : "<choice>");
 		} else {
 			fprintf(stderr, "%s:%d:\tsymbol %s %s is visible depending on %s\n",
-				prop->file->name, prop->lineno,
+				prop->filename, prop->lineno,
 				sym->name ? sym->name : "<choice>",
 				prop_get_type_name(prop->type),
 				next_sym->name ? next_sym->name : "<choice>");

scripts/kconfig/tests/choice_randomize/Kconfig+22−0

@@ -0,0 +1,22 @@
	1	choice
	2	prompt "choose A or B"
	3
	4	config A
	5	bool "A"
	6
	7	config B
	8	bool "B"
	9
	10	endchoice
	11
	12	choice
	13	prompt "choose X or Y"
	14	depends on B
	15
	16	config X
	17	bool "X"
	18
	19	config Y
	20	bool "Y"
	21
	22	endchoice

scripts/kconfig/tests/choice_randomize/__init__.py+34−0

@@ -0,0 +1,34 @@
	1	# SPDX-License-Identifier: GPL-2.0-only
	2	"""
	3	Randomize all dependent choices
	4
	5	This is a somewhat tricky case for randconfig; the visibility of one choice is
	6	determined by a member of another choice. Randconfig should be able to generate
	7	all possible patterns.
	8	"""
	9
	10
	11	def test(conf):
	12
	13	expected0 = False
	14	expected1 = False
	15	expected2 = False
	16
	17	for i in range(100):
	18	assert conf.randconfig(seed=i) == 0
	19
	20	if conf.config_matches('expected_config0'):
	21	expected0 = True
	22	elif conf.config_matches('expected_config1'):
	23	expected1 = True
	24	elif conf.config_matches('expected_config2'):
	25	expected2 = True
	26	else:
	27	assert False
	28
	29	if expected0 and expected1 and expected2:
	30	break
	31
	32	assert expected0
	33	assert expected1
	34	assert expected2

scripts/kconfig/tests/choice_randomize/expected_config0+6−0

@@ -0,0 +1,6 @@
	1	#
	2	# Automatically generated file; DO NOT EDIT.
	3	# Main menu
	4	#
	5	CONFIG_A=y
	6	# CONFIG_B is not set

scripts/kconfig/tests/choice_randomize/expected_config1+8−0

@@ -0,0 +1,8 @@
	1	#
	2	# Automatically generated file; DO NOT EDIT.
	3	# Main menu
	4	#
	5	# CONFIG_A is not set
	6	CONFIG_B=y
	7	CONFIG_X=y
	8	# CONFIG_Y is not set

scripts/kconfig/tests/choice_randomize/expected_config2+8−0

@@ -0,0 +1,8 @@
	1	#
	2	# Automatically generated file; DO NOT EDIT.
	3	# Main menu
	4	#
	5	# CONFIG_A is not set
	6	CONFIG_B=y
	7	# CONFIG_X is not set
	8	CONFIG_Y=y

scripts/kconfig/tests/choice_randomize2/Kconfig+32−0

@@ -0,0 +1,32 @@
	1	choice
	2	prompt "This is always invisible"
	3	depends on n
	4
	5	config DUMMY
	6	bool "DUMMY"
	7
	8	endchoice
	9
	10	choice
	11	prompt "Choose A or B"
	12
	13	config A
	14	bool "A"
	15
	16	config B
	17	bool "B"
	18
	19	endchoice
	20
	21	config FOO
	22	bool "FOO"
	23	depends on A
	24
	25	choice
	26	prompt "Choose X"
	27	depends on FOO
	28
	29	config X
	30	bool "X"
	31
	32	endchoice

scripts/kconfig/tests/choice_randomize2/__init__.py+18−0

@@ -0,0 +1,18 @@
	1	# SPDX-License-Identifier: GPL-2.0-only
	2	"""
	3	Randomize choices with correct dependencies
	4
	5	When shuffling a choice may potentially disrupt certain dependencies, symbol
	6	values must be recalculated.
	7
	8	Related Linux commits:
	9	- c8fb7d7e48d11520ad24808cfce7afb7b9c9f798
	10	"""
	11
	12
	13	def test(conf):
	14	for i in range(20):
	15	assert conf.randconfig(seed=i) == 0
	16	assert (conf.config_matches('expected_config0') or
	17	conf.config_matches('expected_config1') or
	18	conf.config_matches('expected_config2'))

scripts/kconfig/tests/choice_randomize2/expected_config0+8−0

@@ -0,0 +1,8 @@
	1	#
	2	# Automatically generated file; DO NOT EDIT.
	3	# Main menu
	4	#
	5	CONFIG_A=y
	6	# CONFIG_B is not set
	7	CONFIG_FOO=y
	8	CONFIG_X=y

scripts/kconfig/tests/choice_randomize2/expected_config1+7−0

@@ -0,0 +1,7 @@
	1	#
	2	# Automatically generated file; DO NOT EDIT.
	3	# Main menu
	4	#
	5	CONFIG_A=y
	6	# CONFIG_B is not set
	7	# CONFIG_FOO is not set

scripts/kconfig/tests/choice_randomize2/expected_config2+6−0

@@ -0,0 +1,6 @@
	1	#
	2	# Automatically generated file; DO NOT EDIT.
	3	# Main menu
	4	#
	5	# CONFIG_A is not set
	6	CONFIG_B=y

scripts/kconfig/tests/conftest.py+10−6

         defconfig_path = os.path.join(self._test_dir, defconfig)
         return self._run_conf('--defconfig={}'.format(defconfig_path))
-    def _allconfig(self, mode, all_config):
+    def _allconfig(self, mode, all_config, extra_env={}):
         if all_config:
             all_config_path = os.path.join(self._test_dir, all_config)
-            extra_env = {'KCONFIG_ALLCONFIG': all_config_path}
+            extra_env['KCONFIG_ALLCONFIG'] = all_config_path
-        else:
-            extra_env = {}
         return self._run_conf('--{}config'.format(mode), extra_env=extra_env)
         """
         return self._allconfig('alldef', all_config)
-    def randconfig(self, all_config=None):
+    def randconfig(self, all_config=None, seed=None):
         """Run randconfig.
         all_config: fragment config file for KCONFIG_ALLCONFIG (optional)
+        seed: the seed for randconfig (optional)
         returncode: exit status of the Kconfig executable
         """
-        return self._allconfig('rand', all_config)
+        if seed is not None:
+            extra_env = {'KCONFIG_SEED': hex(seed)}
+        else:
+            extra_env = {}
+        return self._allconfig('rand', all_config, extra_env=extra_env)
     def savedefconfig(self, dot_config):
         """Run savedefconfig.

scripts/kconfig/tests/err_recursive_dep/expected_stderr+11−11

@@ -1,10 +1,10 @@
1	Kconfig:11:error: recursive dependency detected!	1	Kconfig:5:error: recursive dependency detected!
2	Kconfig:11: symbol B is selected by B	2	Kconfig:5: symbol A depends on A
3	For a resolution refer to Documentation/kbuild/kconfig-language.rst	3	For a resolution refer to Documentation/kbuild/kconfig-language.rst
4	subsection "Kconfig recursive dependency limitations"	4	subsection "Kconfig recursive dependency limitations"
5		5
6	Kconfig:5:error: recursive dependency detected!	6	Kconfig:11:error: recursive dependency detected!
7	Kconfig:5: symbol A depends on A	7	Kconfig:11: symbol B is selected by B
8	For a resolution refer to Documentation/kbuild/kconfig-language.rst	8	For a resolution refer to Documentation/kbuild/kconfig-language.rst
9	subsection "Kconfig recursive dependency limitations"	9	subsection "Kconfig recursive dependency limitations"
10		10
@@ -14,9 +14,9 @@ Kconfig:21: symbol C2 depends on C1 · 3 unmodified lines
14	For a resolution refer to Documentation/kbuild/kconfig-language.rst	14	For a resolution refer to Documentation/kbuild/kconfig-language.rst
15	subsection "Kconfig recursive dependency limitations"	15	subsection "Kconfig recursive dependency limitations"
16		16
17	Kconfig:32:error: recursive dependency detected!	17	Kconfig:27:error: recursive dependency detected!
18	Kconfig:32: symbol D2 is selected by D1
19	Kconfig:27: symbol D1 depends on D2	18	Kconfig:27: symbol D1 depends on D2
		19	Kconfig:32: symbol D2 is selected by D1
20	For a resolution refer to Documentation/kbuild/kconfig-language.rst	20	For a resolution refer to Documentation/kbuild/kconfig-language.rst
21	subsection "Kconfig recursive dependency limitations"	21	subsection "Kconfig recursive dependency limitations"
22		22
@@ -26,13 +26,13 @@ Kconfig:42: symbol E2 is implied by E1 · 3 unmodified lines
26	For a resolution refer to Documentation/kbuild/kconfig-language.rst	26	For a resolution refer to Documentation/kbuild/kconfig-language.rst
27	subsection "Kconfig recursive dependency limitations"	27	subsection "Kconfig recursive dependency limitations"
28		28
29	Kconfig:60:error: recursive dependency detected!	29	Kconfig:49:error: recursive dependency detected!
30	Kconfig:60: symbol G depends on G	30	Kconfig:49: symbol F1 default value contains F2
		31	Kconfig:51: symbol F2 depends on F1
31	For a resolution refer to Documentation/kbuild/kconfig-language.rst	32	For a resolution refer to Documentation/kbuild/kconfig-language.rst
32	subsection "Kconfig recursive dependency limitations"	33	subsection "Kconfig recursive dependency limitations"
33		34
34	Kconfig:51:error: recursive dependency detected!	35	Kconfig:60:error: recursive dependency detected!
35	Kconfig:51: symbol F2 depends on F1	36	Kconfig:60: symbol G depends on G
36	Kconfig:49: symbol F1 default value contains F2
37	For a resolution refer to Documentation/kbuild/kconfig-language.rst	37	For a resolution refer to Documentation/kbuild/kconfig-language.rst
38	subsection "Kconfig recursive dependency limitations"	38	subsection "Kconfig recursive dependency limitations"

scripts/kconfig/util.c+36−11

@@ -7,25 +7,50 @@ · 6 unmodified lines
7	#include <stdarg.h>	7	#include <stdarg.h>
8	#include <stdlib.h>	8	#include <stdlib.h>
9	#include <string.h>	9	#include <string.h>
		10
		11	#include "hashtable.h"
10	#include "lkc.h"	12	#include "lkc.h"
11		13
		14	unsigned int strhash(const char *s)
		15	{
		16	/* fnv32 hash */
		17	unsigned int hash = 2166136261U;
		18
		19	for (; *s; s++)
		20	hash = (hash ^ s) 0x01000193;
		21	return hash;
		22	}
		23
		24	/* hash table of all parsed Kconfig files */
		25	static HASHTABLE_DEFINE(file_hashtable, 1U << 11);
		26
		27	struct file {
		28	struct hlist_node node;
		29	char name[];
		30	};
		31
12	/* file already present in list? If not add it */	32	/* file already present in list? If not add it */
13	struct file file_lookup(const char name)	33	const char file_lookup(const char name)
14	{	34	{
15	struct file *file;	35	struct file *file;
		36	size_t len;
		37	int hash = strhash(name);
16		38
17	for (file = file_list; file; file = file->next) {	39	hash_for_each_possible(file_hashtable, file, node, hash)
18	if (!strcmp(name, file->name)) {	40	if (!strcmp(name, file->name))
19	return file;	41	return file->name;
20	}
21	}
22		42
23	file = xmalloc(sizeof(*file));	43	len = strlen(name);
		44	file = xmalloc(sizeof(*file) + len + 1);
24	memset(file, 0, sizeof(*file));	45	memset(file, 0, sizeof(*file));
25	file->name = xstrdup(name);	46	memcpy(file->name, name, len);
26	file->next = file_list;	47	file->name[len] = '\0';
27	file_list = file;	48
28	return file;	49	hash_add(file_hashtable, &file->node, hash);
		50
		51	str_printf(&autoconf_cmd, "\t%s \\\n", name);
		52
		53	return file->name;
29	}	54	}
30		55
31	/* Allocate initial growable string */	56	/* Allocate initial growable string */

scripts/mod/modpost.c+3−1

@@ -1050,7 +1050,9 @@ static void default_mismatch_handler(const char modname, struct elf_info elf, · 1049 unmodified lines
1050	sec_mismatch_count++;	1050	sec_mismatch_count++;
1051		1051
1052	warn("%s: section mismatch in reference: %s+0x%x (section: %s) -> %s (section: %s)\n",	1052	warn("%s: section mismatch in reference: %s+0x%x (section: %s) -> %s (section: %s)\n",
1053	modname, fromsym, (unsigned int)(faddr - from->st_value), fromsec, tosym, tosec);	1053	modname, fromsym,
		1054	(unsigned int)(faddr - (from ? from->st_value : 0)),
		1055	fromsec, tosym, tosec);
1054		1056
1055	if (mismatch->mismatch == EXTABLE_TO_NON_TEXT) {	1057	if (mismatch->mismatch == EXTABLE_TO_NON_TEXT) {
1056	if (match(tosec, mismatch->bad_tosec))	1058	if (match(tosec, mismatch->bad_tosec))

scripts/package/builddeb+12−38

@@ -24,24 +24,10 @@ if_enabled_echo() { · 23 unmodified lines
24	fi	24	fi
25	}	25	}
26		26
27	create_package() {
28	export DH_OPTIONS="-p${1}"
29
30	dh_installdocs
31	dh_installchangelogs
32	dh_compress
33	dh_fixperms
34	dh_gencontrol
35	dh_md5sums
36	dh_builddeb -- ${KDEB_COMPRESS:+-Z$KDEB_COMPRESS}
37	}
38
39	install_linux_image () {	27	install_linux_image () {
40	pname=$1	28	pname=$1
41	pdir=debian/$1	29	pdir=debian/$1
42		30
43	rm -rf ${pdir}
44
45	# Only some architectures with OF support have this target	31	# Only some architectures with OF support have this target
46	if is_enabled CONFIG_OF_EARLY_FLATTREE && [ -d "${srctree}/arch/${SRCARCH}/boot/dts" ]; then	32	if is_enabled CONFIG_OF_EARLY_FLATTREE && [ -d "${srctree}/arch/${SRCARCH}/boot/dts" ]; then
47	${MAKE} -f ${srctree}/Makefile INSTALL_DTBS_PATH="${pdir}/usr/lib/linux-image-${KERNELRELEASE}" dtbs_install	33	${MAKE} -f ${srctree}/Makefile INSTALL_DTBS_PATH="${pdir}/usr/lib/linux-image-${KERNELRELEASE}" dtbs_install
@@ -109,8 +95,6 @@ install_linux_image () { · 61 unmodified lines
109	install_linux_image_dbg () {	95	install_linux_image_dbg () {
110	pdir=debian/$1	96	pdir=debian/$1
111		97
112	rm -rf ${pdir}
113
114	# Parse modules.order directly because 'make modules_install' may sign,	98	# Parse modules.order directly because 'make modules_install' may sign,
115	# compress modules, and then run unneeded depmod.	99	# compress modules, and then run unneeded depmod.
116	while read -r mod; do	100	while read -r mod; do
@@ -140,8 +124,6 @@ install_kernel_headers () { · 23 unmodified lines
140	pdir=debian/$1	124	pdir=debian/$1
141	version=${1#linux-headers-}	125	version=${1#linux-headers-}
142		126
143	rm -rf $pdir
144
145	"${srctree}/scripts/package/install-extmod-build" "${pdir}/usr/src/linux-headers-${version}"	127	"${srctree}/scripts/package/install-extmod-build" "${pdir}/usr/src/linux-headers-${version}"
146		128
147	mkdir -p $pdir/lib/modules/$version/	129	mkdir -p $pdir/lib/modules/$version/
@@ -151,8 +133,6 @@ install_kernel_headers () { · 3 unmodified lines
151	install_libc_headers () {	133	install_libc_headers () {
152	pdir=debian/$1	134	pdir=debian/$1
153		135
154	rm -rf $pdir
155
156	$MAKE -f $srctree/Makefile headers_install INSTALL_HDR_PATH=$pdir/usr	136	$MAKE -f $srctree/Makefile headers_install INSTALL_HDR_PATH=$pdir/usr
157		137
158	# move asm headers to /usr/include/<libc-machine>/asm to match the structure	138	# move asm headers to /usr/include/<libc-machine>/asm to match the structure
@@ -161,21 +141,15 @@ install_libc_headers () { · 2 unmodified lines
161	mv "$pdir/usr/include/asm" "$pdir/usr/include/${DEB_HOST_MULTIARCH}"	141	mv "$pdir/usr/include/asm" "$pdir/usr/include/${DEB_HOST_MULTIARCH}"
162	}	142	}
163		143
164	rm -f debian/files	144	package=$1
165		145
166	packages_enabled=$(dh_listpackages)	146	case "${package}" in
167		147	*-dbg)
168	for package in ${packages_enabled}	148	install_linux_image_dbg "${package}";;
169	do	149	linux-image-\|user-mode-linux-)
170	case ${package} in	150	install_linux_image "${package}";;
171	*-dbg)	151	linux-libc-dev)
172	install_linux_image_dbg "${package}";;	152	install_libc_headers "${package}";;
173	linux-image-\|user-mode-linux-)	153	linux-headers-*)
174	install_linux_image "${package}";;	154	install_kernel_headers "${package}";;
175	linux-libc-dev)	155	esac
176	install_libc_headers "${package}";;
177	linux-headers-*)
178	install_kernel_headers "${package}";;
179	esac
180	create_package "${package}"
181	done

scripts/package/debian/rules+54−9

@@ -11,28 +11,73 @@ ifneq (,$(filter-out parallel=1,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))) · 10 unmodified lines
11	MAKEFLAGS += -j$(NUMJOBS)	11	MAKEFLAGS += -j$(NUMJOBS)
12	endif	12	endif
13		13
		14	# When KBUILD_VERBOSE is undefined (presumably you are directly working with
		15	# the debianized tree), show verbose logs unless DEB_BUILD_OPTION=terse is set.
		16	ifeq ($(origin KBUILD_VERBOSE),undefined)
		17	ifeq (,$(filter terse,$(DEB_BUILD_OPTIONS)))
		18	export KBUILD_VERBOSE := 1
		19	else
		20	Q := @
		21	endif
		22	endif
		23
14	revision = $(lastword $(subst -, ,$(shell dpkg-parsechangelog -S Version)))	24	revision = $(lastword $(subst -, ,$(shell dpkg-parsechangelog -S Version)))
15	CROSS_COMPILE ?= $(filter-out $(DEB_BUILD_GNU_TYPE)-, $(DEB_HOST_GNU_TYPE)-)	25	CROSS_COMPILE ?= $(filter-out $(DEB_BUILD_GNU_TYPE)-, $(DEB_HOST_GNU_TYPE)-)
16	make-opts = ARCH=$(ARCH) KERNELRELEASE=$(KERNELRELEASE) KBUILD_BUILD_VERSION=$(revision) $(addprefix CROSS_COMPILE=,$(CROSS_COMPILE))	26	make-opts = ARCH=$(ARCH) KERNELRELEASE=$(KERNELRELEASE) KBUILD_BUILD_VERSION=$(revision) $(addprefix CROSS_COMPILE=,$(CROSS_COMPILE))
17		27
		28	binary-targets := $(addprefix binary-, image image-dbg headers libc-dev)
		29
		30	all-packages = $(shell dh_listpackages)
		31	image-package = $(filter linux-image-% user-%, $(filter-out %-dbg, $(all-packages)))
		32	image-dbg-package = $(filter %-dbg, $(all-packages))
		33	libc-dev-package = $(filter linux-libc-dev, $(all-packages))
		34	headers-package = $(filter linux-headers-%, $(all-packages))
		35
		36	mk-files = $(patsubst binary-%,debian/%.files,$1)
		37	package = $($(@:binary-%=%-package))
		38
		39	# DH_OPTION is an environment variable common for all debhelper commands.
		40	# We could 'export' it, but here it is passed from the command line to clarify
		41	# which package is being processed in the build log.
		42	DH_OPTIONS = -p$(package)
		43
		44	define binary
		45	$(Q)dh_testdir $(DH_OPTIONS)
		46	$(Q)dh_testroot $(DH_OPTIONS)
		47	$(Q)dh_prep $(DH_OPTIONS)
		48	$(Q)+$(MAKE) $(make-opts) run-command KBUILD_RUN_COMMAND='+$$(srctree)/scripts/package/builddeb $(package)'
		49	$(Q)dh_installdocs $(DH_OPTIONS)
		50	$(Q)dh_installchangelogs $(DH_OPTIONS)
		51	$(Q)dh_compress $(DH_OPTIONS)
		52	$(Q)dh_fixperms $(DH_OPTIONS)
		53	$(Q)dh_gencontrol $(DH_OPTIONS) -- -f$(call mk-files,$@)
		54	$(Q)dh_md5sums $(DH_OPTIONS)
		55	$(Q)dh_builddeb $(DH_OPTIONS) -- $(addprefix -Z,$(KDEB_COMPRESS))
		56	endef
		57
		58	.PHONY: $(binary-targets)
		59	$(binary-targets): build-arch
		60	$(Q)truncate -s0 $(call mk-files,$@)
		61	$(if $(package),$(binary))
		62
18	.PHONY: binary binary-indep binary-arch	63	.PHONY: binary binary-indep binary-arch
19	binary: binary-arch binary-indep	64	binary: binary-arch binary-indep
20	binary-indep: build-indep	65	binary-indep: build-indep
21	binary-arch: build-arch	66	binary-arch: $(binary-targets)
22	$(MAKE) $(make-opts) \	67	$(Q)cat $(call mk-files,$^) > debian/files
23	run-command KBUILD_RUN_COMMAND='+$$(srctree)/scripts/package/builddeb'
24		68
25	.PHONY: build build-indep build-arch	69	.PHONY: build build-indep build-arch
26	build: build-arch build-indep	70	build: build-arch build-indep
27	build-indep:	71	build-indep:
28	build-arch:	72	build-arch:
29	$(MAKE) $(make-opts) olddefconfig	73	$(Q)$(MAKE) $(make-opts) olddefconfig
30	$(MAKE) $(make-opts) $(if $(filter um,$(ARCH)),,headers) all	74	$(Q)$(MAKE) $(make-opts) $(if $(filter um,$(ARCH)),,headers) all
31		75
32	.PHONY: clean	76	.PHONY: clean
33	clean:	77	clean:
34	rm -rf debian/files debian/linux-* debian/deb-env.vars*	78	$(Q)dh_clean
35	$(MAKE) ARCH=$(ARCH) clean	79	$(Q)rm -rf debian/deb-env.vars* debian/*.files
		80	$(Q)$(MAKE) ARCH=$(ARCH) clean
36		81
37	# If DEB_HOST_ARCH is empty, it is likely that debian/rules was executed	82	# If DEB_HOST_ARCH is empty, it is likely that debian/rules was executed
38	# directly. Run 'dpkg-architecture --print-set --print-format=make' to	83	# directly. Run 'dpkg-architecture --print-set --print-format=make' to
@@ -41,6 +86,6 @@ ifndef DEB_HOST_ARCH · 2 unmodified lines
41	include debian/deb-env.vars	86	include debian/deb-env.vars
42		87
43	debian/deb-env.vars:	88	debian/deb-env.vars:
44	dpkg-architecture -a$$(cat debian/arch) --print-set --print-format=make > $@.tmp	89	$(Q)dpkg-architecture -a$$(cat debian/arch) --print-set --print-format=make > $@.tmp
45	mv $@.tmp $@	90	$(Q)mv $@.tmp $@
46	endif	91	endif

scripts/package/kernel.spec+37−11

 %{make} %{makeflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install
 cp System.map %{buildroot}/lib/modules/%{KERNELRELEASE}
 cp .config %{buildroot}/lib/modules/%{KERNELRELEASE}/config
+if %{make} %{makeflags} run-command KBUILD_RUN_COMMAND='test -d ${srctree}/arch/${SRCARCH}/boot/dts' 2>/dev/null; then
+	%{make} %{makeflags} INSTALL_DTBS_PATH=%{buildroot}/lib/modules/%{KERNELRELEASE}/dtb dtbs_install
+fi
 ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEASE}/build
 %if %{with_devel}
 %{make} %{makeflags} run-command KBUILD_RUN_COMMAND='${srctree}/scripts/package/install-extmod-build %{buildroot}/usr/src/kernels/%{KERNELRELEASE}'
 %endif
+{
+	for x in System.map config kernel modules.builtin \
+			modules.builtin.modinfo modules.order vmlinuz; do
+		echo "/lib/modules/%{KERNELRELEASE}/${x}"
+	done
+	for x in alias alias.bin builtin.alias.bin builtin.bin dep dep.bin \
+					devname softdep symbols symbols.bin; do
+		echo "%ghost /lib/modules/%{KERNELRELEASE}/modules.${x}"
+	done
+	for x in System.map config vmlinuz; do
+		echo "%ghost /boot/${x}-%{KERNELRELEASE}"
+	done
+	if [ -d "%{buildroot}/lib/modules/%{KERNELRELEASE}/dtb" ];then
+		echo "/lib/modules/%{KERNELRELEASE}/dtb"
+		find "%{buildroot}/lib/modules/%{KERNELRELEASE}/dtb" -printf "%%%ghost /boot/dtb-%{KERNELRELEASE}/%%P\n"
+	fi
+	echo "%exclude /lib/modules/%{KERNELRELEASE}/build"
+} > %{buildroot}/kernel.list
 %clean
 rm -rf %{buildroot}
 		cp "/lib/modules/%{KERNELRELEASE}/${file}" "/boot/${file}-%{KERNELRELEASE}"
 	fi
 done
+if [ -d "/lib/modules/%{KERNELRELEASE}/dtb" ] && \
+   ! diff -rq "/lib/modules/%{KERNELRELEASE}/dtb" "/boot/dtb-%{KERNELRELEASE}" >/dev/null 2>&1; then
+	rm -rf "/boot/dtb-%{KERNELRELEASE}"
+	cp -r "/lib/modules/%{KERNELRELEASE}/dtb" "/boot/dtb-%{KERNELRELEASE}"
+fi
+if [ ! -e "/lib/modules/%{KERNELRELEASE}/modules.dep" ]; then
+	/usr/sbin/depmod %{KERNELRELEASE}
+fi
 %preun
-if [ -x /sbin/new-kernel-pkg ]; then
+if [ -x /usr/bin/kernel-install ]; then
-new-kernel-pkg --remove %{KERNELRELEASE} --rminitrd --initrdfile=/boot/initramfs-%{KERNELRELEASE}.img
-elif [ -x /usr/bin/kernel-install ]; then
 kernel-install remove %{KERNELRELEASE}
 fi
-%postun
+%files -f %{buildroot}/kernel.list
-if [ -x /sbin/update-bootloader ]; then
-/sbin/update-bootloader --remove %{KERNELRELEASE}
-fi
-%files
 %defattr (-, root, root)
-/lib/modules/%{KERNELRELEASE}
+%exclude /kernel.list
-%exclude /lib/modules/%{KERNELRELEASE}/build
 %files headers
 %defattr (-, root, root)

tools/lib/bpf/Makefile+1−1

@@ -2,7 +2,7 @@ · 1 unmodified line
2	# Most of this file is copied from tools/lib/traceevent/Makefile	2	# Most of this file is copied from tools/lib/traceevent/Makefile
3		3
4	RM ?= rm	4	RM ?= rm
5	srctree = $(abs_srctree)	5	srctree := $(realpath $(srctree))
6		6
7	VERSION_SCRIPT := libbpf.map	7	VERSION_SCRIPT := libbpf.map
8	LIBBPF_VERSION := $(shell \	8	LIBBPF_VERSION := $(shell \

Merge tag 'kbuild-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code