linux-kernel - [PATCH] sparc: fix bad merge of sparc Kconfig

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]

Date:	Mon, 28 May 2012 13:43:48 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"David S. Miller" <davem@...emloft.net>
Cc:	sparclinux@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH] sparc: fix bad merge of sparc Kconfig

Fixes this sparc32 defconfig build error:

timekeeping.c:(.text+0x277c4): undefined reference to `arch_gettimeoffset'

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 arch/sparc/Kconfig |    1 -
 1 file changed, 1 deletion(-)

Dave, I have been carrying this merge fix in linux-next for a while and
now it is needed in Linus' tree.

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 9be0dd2..35e08fe 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -39,7 +39,6 @@ config SPARC32
 	def_bool !64BIT
 	select GENERIC_ATOMIC64
 	select CLZ_TAB
-	select ARCH_USES_GETTIMEOFFSET

 config SPARC64
 	def_bool 64BIT
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped