From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3CFEFC433E1 for ; Sat, 15 Aug 2020 22:04:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 19DEA2053B for ; Sat, 15 Aug 2020 22:04:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="lfnEF5dz"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="goupLROJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728607AbgHOVvF (ORCPT ); Sat, 15 Aug 2020 17:51:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728486AbgHOVuy (ORCPT ); Sat, 15 Aug 2020 17:50:54 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93C22C09B052; Sat, 15 Aug 2020 08:47:04 -0700 (PDT) Date: Sat, 15 Aug 2020 15:46:51 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1597506412; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Pu4f7XjhFcULlGOVp6eLrt6povAfc7FbC/8I3SqVmYY=; b=lfnEF5dzZ75XgnRafY1H0VO2AdK2iJR8TYD8lkeaZ9D88/FyMhkj0AWwRYrLQWROasVJMZ x6p3OJ4V6WIa8CjjdCe4GswOc1pzeepDZcxkx5uArP5jaIAYQ3BCJh8WhHmMXEzJxUDZRG 08DqYkklBkVhL8Qwlrzny6ghsLExWGCoeTnSRnXcsQLG7qldkb05+wlcD1AmO0YfaFYrB7 H/QZK/wFsJYN97gvKY5ghYKyoZlp2TZSXHxHFmGjUGBEJddogCHx9EPqddubuMBZUNhg3z d7elTX055dRTZ4+zSaxOTaAomoy6Fu8gnr4kZ8mlZgKtXzxbke3rUi2AeiBAXQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1597506412; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Pu4f7XjhFcULlGOVp6eLrt6povAfc7FbC/8I3SqVmYY=; b=goupLROJKx+xszbQtEWoArKYb0+Af5Nlu93cM64eo5C0vTpjWp8Xt+T0rjaVoJxtCEDRDc PjxI9gTUliMNjKBA== From: "tip-bot2 for Juergen Gross" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/paravirt] x86/paravirt: Use CONFIG_PARAVIRT_XXL instead of CONFIG_PARAVIRT Cc: Juergen Gross , Ingo Molnar , x86 , LKML In-Reply-To: <20200815100641.26362-4-jgross@suse.com> References: <20200815100641.26362-4-jgross@suse.com> MIME-Version: 1.0 Message-ID: <159750641175.3192.2969286932741999871.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/paravirt branch of tip: Commit-ID: ecac71816a1829c0e54c41c5f1845f75b55dc618 Gitweb: https://git.kernel.org/tip/ecac71816a1829c0e54c41c5f1845f75b55dc618 Author: Juergen Gross AuthorDate: Sat, 15 Aug 2020 12:06:38 +02:00 Committer: Ingo Molnar CommitterDate: Sat, 15 Aug 2020 13:52:11 +02:00 x86/paravirt: Use CONFIG_PARAVIRT_XXL instead of CONFIG_PARAVIRT There are some code parts using CONFIG_PARAVIRT for Xen pvops related issues instead of the more stringent CONFIG_PARAVIRT_XXL. Signed-off-by: Juergen Gross Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20200815100641.26362-4-jgross@suse.com --- arch/x86/entry/entry_64.S | 4 ++-- arch/x86/include/asm/fixmap.h | 2 +- arch/x86/include/asm/required-features.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 70dea93..26fc9b4 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -46,13 +46,13 @@ .code64 .section .entry.text, "ax" -#ifdef CONFIG_PARAVIRT +#ifdef CONFIG_PARAVIRT_XXL SYM_CODE_START(native_usergs_sysret64) UNWIND_HINT_EMPTY swapgs sysretq SYM_CODE_END(native_usergs_sysret64) -#endif /* CONFIG_PARAVIRT */ +#endif /* CONFIG_PARAVIRT_XXL */ /* * 64-bit SYSCALL instruction entry. Up to 6 arguments in registers. diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h index 0f0dd64..77217bd 100644 --- a/arch/x86/include/asm/fixmap.h +++ b/arch/x86/include/asm/fixmap.h @@ -99,7 +99,7 @@ enum fixed_addresses { FIX_PCIE_MCFG, #endif #endif -#ifdef CONFIG_PARAVIRT +#ifdef CONFIG_PARAVIRT_XXL FIX_PARAVIRT_BOOTMAP, #endif #ifdef CONFIG_X86_INTEL_MID diff --git a/arch/x86/include/asm/required-features.h b/arch/x86/include/asm/required-features.h index 6847d85..3ff0d48 100644 --- a/arch/x86/include/asm/required-features.h +++ b/arch/x86/include/asm/required-features.h @@ -54,7 +54,7 @@ #endif #ifdef CONFIG_X86_64 -#ifdef CONFIG_PARAVIRT +#ifdef CONFIG_PARAVIRT_XXL /* Paravirtualized systems may not have PSE or PGE available */ #define NEED_PSE 0 #define NEED_PGE 0