Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754610AbbBJKfP (ORCPT ); Tue, 10 Feb 2015 05:35:15 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:23975 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750704AbbBJKfI (ORCPT ); Tue, 10 Feb 2015 05:35:08 -0500 X-AuditID: cbfec7f4-b7f126d000001e9a-8c-54d9de48b71e From: Andrey Ryabinin To: Andrew Morton Cc: Jim Davis , Stephen Rothwell , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, linux-next , linux-kernel , Andrey Ryabinin Subject: [PATCH] x86_64-add-kasan-support-fix Date: Tue, 10 Feb 2015 13:34:53 +0300 Message-id: <1423564493-14372-1-git-send-email-a.ryabinin@samsung.com> X-Mailer: git-send-email 2.3.0 In-reply-to: References: X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprJLMWRmVeSWpSXmKPExsVy+t/xK7oe926GGLTeU7LY9usRm8Wc9WvY LKZtFLfof7Wc2eLyrjlsFgcXtjFaXDqwgMli696r7BabN01ltvix4TGrA5dH440bbB47Z91l 99i0qpPN4925c+weJ2b8ZvF4v+8qm0ffllWMHp83yXmcaPnCGsAZxWWTkpqTWZZapG+XwJVx qKmfreA9V0Xb5+WsDYxrObsYOTkkBEwkVs17ywRhi0lcuLeerYuRi0NIYCmjxKKvb6CcPiaJ iTcOsYFUsQnoSfybtR3MFhHQlVj1fBczSBGzwDkmiVOXZoMlhIESc0/2M4PYLAKqEtt2T2QB sXkF3CS+9/YzQqyTk5hz5yKYzSkQLHGo4RbYGUICARJ71pxjncDIu4CRYRWjaGppckFxUnqu oV5xYm5xaV66XnJ+7iZGSHB+2cG4+JjVIUYBDkYlHt6ACTdDhFgTy4orcw8xSnAwK4nwis4D CvGmJFZWpRblxxeV5qQWH2Jk4uCUamCsKU6t0eafXCGmV5/2s+CYQcpnh/jnU8+mz04q6/n5 Xz5hq9r+CPkuQe3qg2KFUU2Jr68f/3HtlNXn/snXBTXSvmTpx++3E1uzXUJl6ZTFU3YZ/o2P YtWcabD3fP9ZpuPbHKINFv6va9TsnLKRY//yqs1aGXPMf0rs3fUxRfzPraTbuu/qu12UWIoz Eg21mIuKEwF4l93FLAIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1596 Lines: 45 Combination of CONFIG_SPARSEMEM_VMEMMAP=n, CONFIG_KASAN=y cause build error: arch/x86/built-in.o: In function `populate_zero_shadow': kasan_init_64.c:(.init.text+0xe2cc): undefined reference to `vmemmap_alloc_block' kasan_init_64.c:(.init.text+0xe3ab): undefined reference to `vmemmap_alloc_block' kasan_init_64.c:(.init.text+0xe483): undefined reference to `vmemmap_alloc_block' arch/x86/built-in.o: In function `kasan_init': (.init.text+0xe65d): undefined reference to `vmemmap_populate' arch/x86/built-in.o: In function `kasan_init': (.init.text+0xe6ea): undefined reference to `vmemmap_populate' make: *** [vmlinux] Error 1 x86_64-specific part of KASAN depends on SPARSEMEM_VMEMMAP. Express this in Kconfig. Signed-off-by: Andrey Ryabinin Reported-by: Jim Davis --- arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 1607c46..1e78e3c 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -85,7 +85,7 @@ config X86 select HAVE_CMPXCHG_LOCAL select HAVE_CMPXCHG_DOUBLE select HAVE_ARCH_KMEMCHECK - select HAVE_ARCH_KASAN if X86_64 + select HAVE_ARCH_KASAN if X86_64 && SPARSEMEM_VMEMMAP select HAVE_USER_RETURN_NOTIFIER select ARCH_BINFMT_ELF_RANDOMIZE_PIE select HAVE_ARCH_JUMP_LABEL -- 2.3.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/