From nobody Fri May 3 05:04:14 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1575817184; cv=none; d=zohomail.com; s=zohoarc; b=eJICwjC9KrpKjRpT5/10nqnqnRICU7BySxoyPLp1Tg3vuyzhyFEUikAbpWPhFnqh3HU7uZcWeGrFJLwraBh3q9B0FaLlAvImt2rPjjpC5pbPr1dyTc0KSiQlt7LODZLWhyqg2VqdkCqcTlPbF2mZXLIITiU445nND4fyNYjbnuQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575817184; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=yrNSK3upSeTmvNc951CM0rby3U04s6TBPaoEfi9o+Og=; b=YSkgKifLgmP6vGzbqFruKeAG7HZDZBtEpU0X/pMe3PmODdhkwDYVwf5adodhkNWbx/7exXv0C1vvGXjtwxlXODe71w2RhjO/D4H3YQ1gFSVgywCZPY2Bzd5C1zzffDIrkgOggXO6r7DnNYjxogsMzxTMwDQwePTql9ERFUKmpF8= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1575817184213886.9586830738352; Sun, 8 Dec 2019 06:59:44 -0800 (PST) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1idy1C-0005x7-DN; Sun, 08 Dec 2019 14:58:42 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1idy1A-0005x2-V7 for xen-devel@lists.xenproject.org; Sun, 08 Dec 2019 14:58:40 +0000 Received: from Galois.linutronix.de (unknown [2a0a:51c0:0:12e:550::1]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 378f1968-19cb-11ea-b6f1-bc764e2007e4; Sun, 08 Dec 2019 14:58:39 +0000 (UTC) Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1idy11-0000Rw-Gb; Sun, 08 Dec 2019 15:58:31 +0100 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id 34AC71C2885; Sun, 8 Dec 2019 15:58:31 +0100 (CET) X-Inumbo-ID: 378f1968-19cb-11ea-b6f1-bc764e2007e4 Date: Sun, 08 Dec 2019 14:58:31 -0000 From: "tip-bot2 for Thomas Gleixner" To: linux-tip-commits@vger.kernel.org In-Reply-To: <20191015191821.11479-23-bigeasy@linutronix.de> References: <20191015191821.11479-23-bigeasy@linutronix.de> MIME-Version: 1.0 Message-ID: <157581711109.21853.12142170301517881405.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1, SHORTCIRCUIT=-0.0001 Subject: [Xen-devel] [tip: sched/urgent] sched/rt, xen: Use CONFIG_PREEMPTION X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: linux-kernel@vger.kernel.org Cc: Juergen Gross , Stefano Stabellini , Peter Zijlstra , Sebastian Andrzej Siewior , x86 , LKML , Ingo Molnar , xen-devel@lists.xenproject.org, Thomas Gleixner , Linus Torvalds , Boris Ostrovsky Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" The following commit has been merged into the sched/urgent branch of tip: Commit-ID: d4a3dcbc4727966a64a64d57e2b5106a138d426d Gitweb: https://git.kernel.org/tip/d4a3dcbc4727966a64a64d57e2b5106a1= 38d426d Author: Thomas Gleixner AuthorDate: Tue, 15 Oct 2019 21:18:09 +02:00 Committer: Ingo Molnar CommitterDate: Sun, 08 Dec 2019 14:37:36 +01:00 sched/rt, xen: Use CONFIG_PREEMPTION CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT. Switch the preempt anand xen-ops code over to use CONFIG_PREEMPTION. Signed-off-by: Thomas Gleixner Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Thomas Gleixner Reviewed-by: Juergen Gross Cc: Boris Ostrovsky Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stefano Stabellini Cc: xen-devel@lists.xenproject.org Link: https://lore.kernel.org/r/20191015191821.11479-23-bigeasy@linutronix.= de Signed-off-by: Ingo Molnar --- drivers/xen/preempt.c | 4 ++-- include/xen/xen-ops.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/xen/preempt.c b/drivers/xen/preempt.c index 8b9919c..70650b2 100644 --- a/drivers/xen/preempt.c +++ b/drivers/xen/preempt.c @@ -8,7 +8,7 @@ #include #include =20 -#ifndef CONFIG_PREEMPT +#ifndef CONFIG_PREEMPTION =20 /* * Some hypercalls issued by the toolstack can take many 10s of @@ -37,4 +37,4 @@ asmlinkage __visible void xen_maybe_preempt_hcall(void) __this_cpu_write(xen_in_preemptible_hcall, true); } } -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h index d89969a..095be1d 100644 --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h @@ -215,7 +215,7 @@ bool xen_running_on_version_or_later(unsigned int major= , unsigned int minor); void xen_efi_runtime_setup(void); =20 =20 -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION =20 static inline void xen_preemptible_hcall_begin(void) { @@ -239,6 +239,6 @@ static inline void xen_preemptible_hcall_end(void) __this_cpu_write(xen_in_preemptible_hcall, false); } =20 -#endif /* CONFIG_PREEMPT */ +#endif /* CONFIG_PREEMPTION */ =20 #endif /* INCLUDE_XEN_OPS_H */ _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel