From: Roger Pau Monne <roger.pau@citrix.com>
Date: Tue, 22 Oct 2024 11:46:07 +0000 (+0200)
Subject: x86/pv: remove unlikely() from BUG_ON() condition in pv_map_ldt_shadow_page()
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=79560b68a16e5ddd1d2dbda14f3e236bcd3b230f;p=people%2Faperard%2Fxen-unstable.git

x86/pv: remove unlikely() from BUG_ON() condition in pv_map_ldt_shadow_page()

BUG_ON() itself already contains an unlikely() wrapping the bug condition.

No functional change.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/arch/x86/pv/mm.c b/xen/arch/x86/pv/mm.c
index 24f0d2e4ff..187f5f6a3e 100644
--- a/xen/arch/x86/pv/mm.c
+++ b/xen/arch/x86/pv/mm.c
@@ -55,7 +55,7 @@ bool pv_map_ldt_shadow_page(unsigned int offset)
     l1_pgentry_t gl1e, *pl1e;
     unsigned long linear = curr->arch.pv.ldt_base + offset;
 
-    BUG_ON(unlikely(in_irq()));
+    BUG_ON(in_irq());
 
     /*
      * Prior limit checking should guarantee this property.  NB. This is