linux-next: manual merge of the tip tree with the kbuild tree

Stephen Rothwell
2012-05-07T05:11:11Z

[-- Attachment #1: Type: text/plain, Size: 1495 bytes --]

Hi all,

Today's linux-next merge of the tip tree got a conflict in Makefile
between commit 1f2bfbd00e46 ("kbuild: link of vmlinux moved to a script")
from the kbuild tree and commit 1dbdc6f177c6 ("kbuild/extable: Hook up
sortextable into the build system") from the tip tree.

I used the Makefile bits from the kbuild tree and added the following
patch as a merge fixup.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 7 May 2012 15:00:04 +1000
Subject: [PATCH] kbuild: merge fix for sorting exceptions tables at build time

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
scripts/link-vmlinux.sh | 10 ++++++++++
1 file changed, 10 insertions(+)

diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index 26c5b65..7d31f61 100644
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -93,6 +93,11 @@ mksysmap()
${CONFIG_SHELL} "${srctree}/scripts/mksysmap" ${1} ${2}
}

+sortextable()
+{
+ ${objtree}/scripts/sortextable ${1}
+}
+
# Delete output files in case of error
trap cleanup SIGHUP SIGINT SIGQUIT SIGTERM ERR
cleanup()
@@ -192,6 +197,11 @@ fi
info LD vmlinux
vmlinux_link "${kallsymso}" vmlinux

+if [ -n "${CONFIG_BUILDTIME_EXTABLE_SORT}" ]; then
+ info SORTEX vmlinux
+ sortextable vmlinux
+fi
+
info SYSMAP System.map
mksysmap vmlinux System.map

--
1.7.10.280.gaa39

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]