Re: linux-next: build failure after merge of the ftrace tree

[Steven Rostedt]

On Fri, 14 Jan 2022 14:34:18 +1100
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> > Does it fail on anything else?  
> 
> This is the first build I do after merging each tree, so I don't know
> about others.  I may be able to do some testing later today (after
> linux-next is released).

Could you see if this fixes it? This is a revert of part of the patch.
Yinan, was there a reason you moved this code?

-- Steve

diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index dd9955f45774..5cdd9bc5c385 100755
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -400,9 +400,6 @@ if [ -n "${CONFIG_DEBUG_INFO_BTF}" -a -n "${CONFIG_BPF}" ]; then
 	${RESOLVE_BTFIDS} vmlinux
 fi
 
-info SYSMAP System.map
-mksysmap vmlinux System.map
-
 if [ -n "${CONFIG_BUILDTIME_TABLE_SORT}" ]; then
 	info SORTTAB vmlinux
 	if ! sorttable vmlinux; then
@@ -411,6 +408,9 @@ if [ -n "${CONFIG_BUILDTIME_TABLE_SORT}" ]; then
 	fi
 fi
 
+info SYSMAP System.map
+mksysmap vmlinux System.map
+
 # step a (see comment above)
 if [ -n "${CONFIG_KALLSYMS}" ]; then
 	mksysmap ${kallsyms_vmlinux} .tmp_System.map