Fixup before upstream merge #7439

Job	Run time
Sparse check	3m 47s
GCC static -fanalyzer	2m 39s
GCC build arm64	19m 6s
GCC build i386	15m 0s
Clang build x86_64	4m 19s
GCC build arm64 allmodconfig	1m 21s
GCC build X86_64 with W=1	2m 50s
GCC build X86_64 with W=1 allmodconfig	1m 24s
GCC build X86_64	17m 34s
	1h 8m 0s

Provide feedback