From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759063AbbIVTng (ORCPT ); Tue, 22 Sep 2015 15:43:36 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54549 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758117AbbIVTne (ORCPT ); Tue, 22 Sep 2015 15:43:34 -0400 Date: Tue, 22 Sep 2015 12:42:33 -0700 From: tip-bot for Toshi Kani Message-ID: Cc: toshi.kani@hpe.com, elliott@hpe.com, mingo@redhat.com, mingo@kernel.org, linux-kernel@vger.kernel.org, jgross@suse.com, konrad.wilk@oracle.com, hpa@zytor.com, tglx@linutronix.de, bp@alien8.de, akpm@linux-foundation.org Reply-To: toshi.kani@hpe.com, elliott@hpe.com, mingo@redhat.com, mingo@kernel.org, linux-kernel@vger.kernel.org, jgross@suse.com, tglx@linutronix.de, hpa@zytor.com, konrad.wilk@oracle.com, bp@alien8.de, akpm@linux-foundation.org In-Reply-To: <1442514264-12475-2-git-send-email-toshi.kani@hpe.com> References: <1442514264-12475-2-git-send-email-toshi.kani@hpe.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/vdso32: Define PGTABLE_LEVELS to 32bit VDSO Git-Commit-ID: fb535ccb30845fe0b7bd09caa37a838985b72ff9 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: fb535ccb30845fe0b7bd09caa37a838985b72ff9 Gitweb: http://git.kernel.org/tip/fb535ccb30845fe0b7bd09caa37a838985b72ff9 Author: Toshi Kani AuthorDate: Thu, 17 Sep 2015 12:24:14 -0600 Committer: Thomas Gleixner CommitDate: Tue, 22 Sep 2015 21:27:32 +0200 x86/vdso32: Define PGTABLE_LEVELS to 32bit VDSO In case of CONFIG_X86_64, vdso32/vclock_gettime.c fakes a 32-bit non-PAE kernel configuration by re-defining it to CONFIG_X86_32. However, it does not re-define CONFIG_PGTABLE_LEVELS leaving it as 4 levels. This mismatch leads to NOT include and , which will cause compile errors when a later patch enhances to use PUD_SHIFT and PMD_SHIFT. These -nopud & -nopmd headers define these SHIFTs for the 32-bit non-PAE kernel. Fix it by re-defining CONFIG_PGTABLE_LEVELS to 2 levels. Signed-off-by: Toshi Kani Cc: Andrew Morton Cc: Juergen Gross Cc: H. Peter Anvin Cc: Ingo Molnar Cc: Borislav Petkov Cc: Konrad Wilk Cc: Robert Elliot Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/1442514264-12475-2-git-send-email-toshi.kani@hpe.com Signed-off-by: Thomas Gleixner --- arch/x86/entry/vdso/vdso32/vclock_gettime.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/entry/vdso/vdso32/vclock_gettime.c b/arch/x86/entry/vdso/vdso32/vclock_gettime.c index 175cc72..87a86e0 100644 --- a/arch/x86/entry/vdso/vdso32/vclock_gettime.c +++ b/arch/x86/entry/vdso/vdso32/vclock_gettime.c @@ -14,11 +14,13 @@ */ #undef CONFIG_64BIT #undef CONFIG_X86_64 +#undef CONFIG_PGTABLE_LEVELS #undef CONFIG_ILLEGAL_POINTER_VALUE #undef CONFIG_SPARSEMEM_VMEMMAP #undef CONFIG_NR_CPUS #define CONFIG_X86_32 1 +#define CONFIG_PGTABLE_LEVELS 2 #define CONFIG_PAGE_OFFSET 0 #define CONFIG_ILLEGAL_POINTER_VALUE 0 #define CONFIG_NR_CPUS 1