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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120507151054.3fa8df4599e81cc6ae87ca7a@canb.auug.org.au>
Date:	Mon, 7 May 2012 15:10:54 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David Daney <david.daney@...ium.com>,
	Sam Ravnborg <sam@...nborg.org>, Michal Marek <mmarek@...e.cz>
Subject: linux-next: manual merge of the tip tree with the kbuild tree

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@...b.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@...b.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@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped