From: Peter Michael Green <plugwash@raspbian.org>
Date: Tue, 21 Sep 2021 18:53:21 +0000 (+0100)
Subject: replace "dmb" with "mcr p15, #0, r0, c7, c10, #5" for armv6
X-Git-Tag: archive/raspbian/4.14.3+32-g9de3671772-1_deb11u1+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=37108a595222191566853216c8b3eb1605adeb89;p=xen.git

replace "dmb" with "mcr p15, #0, r0, c7, c10, #5" for armv6


Gbp-Pq: Name armv6.diff
---

diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h
index 4c89b7294c..f166d90360 100644
--- a/tools/libxc/include/xenctrl.h
+++ b/tools/libxc/include/xenctrl.h
@@ -76,9 +76,9 @@
 #define xen_rmb() xen_barrier()
 #define xen_wmb() xen_barrier()
 #elif defined(__arm__)
-#define xen_mb()   asm volatile ("dmb" : : : "memory")
-#define xen_rmb()  asm volatile ("dmb" : : : "memory")
-#define xen_wmb()  asm volatile ("dmb" : : : "memory")
+#define xen_mb()   asm volatile ("mcr p15, #0, r0, c7, c10, #5" : : : "memory")
+#define xen_rmb()  asm volatile ("mcr p15, #0, r0, c7, c10, #5" : : : "memory")
+#define xen_wmb()  asm volatile ("mcr p15, #0, r0, c7, c10, #5" : : : "memory")
 #elif defined(__aarch64__)
 #define xen_mb()   asm volatile ("dmb sy" : : : "memory")
 #define xen_rmb()  asm volatile ("dmb sy" : : : "memory")