From patchwork Fri Oct 19 12:49:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changbin Du X-Patchwork-Id: 10649329 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0951815E2 for ; Fri, 19 Oct 2018 12:49:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED7C828ADC for ; Fri, 19 Oct 2018 12:49:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E1DB528AE6; Fri, 19 Oct 2018 12:49:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D20E328ADC for ; Fri, 19 Oct 2018 12:49:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727464AbeJSUze (ORCPT ); Fri, 19 Oct 2018 16:55:34 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:41575 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727189AbeJSUze (ORCPT ); Fri, 19 Oct 2018 16:55:34 -0400 Received: by mail-pf1-f195.google.com with SMTP id m77-v6so16442043pfi.8; Fri, 19 Oct 2018 05:49:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=m3s0ND8Y5PaLjIt9gK0grLpTrPnu+YvRB4PruCgvKtg=; b=gQFp0CqvxWiGub/3+O3ZZ6O/D5OH99SVufaPys1gFursted1s37+Qi5A5luk6w+DR5 jG80g4ehbf50BF9Wr9UOdv/dTtfKTpX94O8NkpQKnptPEZ3IyLG3rx//UrPpfVxb0zOd oBYNm9uYKARVMVgX1b95H9RZOPlJ2dS9rezEu2+jvVi4re3IvhMWXz0ZKY6PnDpiJgHR /Pb4aw/+qUmFDoX9kPlNxIT+ntn5dyGjGFHyXrYOMioomQl8D9srr7+aniYnysnG+kUs zBy8B6rZijhiG4haLJdGNlmGg+zQUqSQR7an/AR7HINF4Vtjn+HNWeiYVjKeShoLDiXV 70MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=m3s0ND8Y5PaLjIt9gK0grLpTrPnu+YvRB4PruCgvKtg=; b=B8XfnpqSmspOvmdWTXSAnDnTwA/0kKyyQhf2dQlpTerY9zg2fWMXLS0nNIVJbecZT+ 9y+M77RuY0ZL/1CiO4772/Y581ACsnD6sBdAsa8te3Fc6znL1yDYKt/RumI0KAvxKcJG VpSW2mV4ccuSxdyQngvtdhDuew2rC9Mu5RDH3tUtORkTNKiF75Vcr63bbQcnyEbbTSto 2PzNpQPONQZ2WRkDMpnqtKTRS+bLFBkd2dbDtPGQUwY3G4wyxBLbvmnxn18fEEBYOwGm ouX3nSiGDoQgVIdMPFx9I+6F+KJJZDv3FKsAT1SweKh1qBW5EpU4nmvn1+/VZExc2SnS AfBg== X-Gm-Message-State: ABuFfogC7qVbpIeEUgV+8K0aCjFKqciTNy6A0u1SORUa7S7aURahhW3B U9EPM9lRCxwKefzPUL4XI1g= X-Google-Smtp-Source: ACcGV63ugIg0pvNshNengjIlldBfTze5yoqmHvVJZ48xpDQ0i/6Z3TjEvP8N79/Ffta8CPIodQ5afw== X-Received: by 2002:a63:1806:: with SMTP id y6-v6mr32886939pgl.187.1539953374792; Fri, 19 Oct 2018 05:49:34 -0700 (PDT) Received: from vultr.guest ([2001:19f0:6001:4ff6:5400:1ff:feb7:a195]) by smtp.gmail.com with ESMTPSA id o131-v6sm33640679pgo.53.2018.10.19.05.49.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Oct 2018 05:49:34 -0700 (PDT) From: Du Changbin To: yamada.masahiro@socionext.com, michal.lkml@markovi.net, tglx@linutronix.de, mingo@redhat.com, linux@armlinux.org.uk, akpm@linux-foundation.org Cc: rostedt@goodmis.org, x86@kernel.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sparse@vger.kernel.org, robin.murphy@arm.com, Du Changbin Subject: [PATCH v2 1/4] x86/mm: surround level4_kernel_pgt with #ifdef CONFIG_X86_5LEVEL...#endif Date: Fri, 19 Oct 2018 12:49:18 +0000 Message-Id: <20181019124921.13780-2-changbin.du@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181019124921.13780-1-changbin.du@gmail.com> References: <20181019124921.13780-1-changbin.du@gmail.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The level4_kernel_pgt is only defined when X86_5LEVEL is enabled. So surround level4_kernel_pgt with #ifdef CONFIG_X86_5LEVEL...#endif to make code correct. Signed-off-by: Du Changbin Acked-by: Steven Rostedt (VMware) --- arch/x86/include/asm/pgtable_64.h | 2 ++ arch/x86/kernel/head64.c | 13 ++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h index 9c85b54bf03c..9333f7fa5bdb 100644 --- a/arch/x86/include/asm/pgtable_64.h +++ b/arch/x86/include/asm/pgtable_64.h @@ -16,7 +16,9 @@ #include #include +#ifdef CONFIG_X86_5LEVEL extern p4d_t level4_kernel_pgt[512]; +#endif extern p4d_t level4_ident_pgt[512]; extern pud_t level3_kernel_pgt[512]; extern pud_t level3_ident_pgt[512]; diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index ddee1f0870c4..4a59ef93c258 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -151,16 +151,15 @@ unsigned long __head __startup_64(unsigned long physaddr, pgd = fixup_pointer(&early_top_pgt, physaddr); p = pgd + pgd_index(__START_KERNEL_map); - if (la57) - *p = (unsigned long)level4_kernel_pgt; - else - *p = (unsigned long)level3_kernel_pgt; - *p += _PAGE_TABLE_NOENC - __START_KERNEL_map + load_delta; - +#ifdef CONFIG_X86_5LEVEL if (la57) { + *p = (unsigned long)level4_kernel_pgt; p4d = fixup_pointer(&level4_kernel_pgt, physaddr); p4d[511] += load_delta; - } + } else +#endif + *p = (unsigned long)level3_kernel_pgt; + *p += _PAGE_TABLE_NOENC - __START_KERNEL_map + load_delta; pud = fixup_pointer(&level3_kernel_pgt, physaddr); pud[510] += load_delta;