diff -Nru xen-4.4.1/debian/changelog xen-4.4.1/debian/changelog --- xen-4.4.1/debian/changelog 2015-04-06 18:23:04.000000000 +0000 +++ xen-4.4.1/debian/changelog 2015-08-30 15:43:51.000000000 +0000 @@ -1,3 +1,9 @@ +xen (4.4.1-9+rpi1) stretch-staging; urgency=medium + + * replace "dmb" with "mcr p15, #0, r0, c7, c10, #5" for armv6 + + -- Peter Michael Green Sun, 30 Aug 2015 15:43:16 +0000 + xen (4.4.1-9) unstable; urgency=high * Explicitly disable graphics for qemu. (closes: #780975) diff -Nru xen-4.4.1/debian/control.md5sum xen-4.4.1/debian/control.md5sum --- xen-4.4.1/debian/control.md5sum 2015-04-06 18:23:48.000000000 +0000 +++ xen-4.4.1/debian/control.md5sum 2015-08-30 16:13:33.000000000 +0000 @@ -1,4 +1,4 @@ -1f5cff49bcdabb72a53ed8b9130437ac debian/changelog +4b54a5cb7ef7f2ef02de4575c35bfb1c debian/changelog 18cd1d3b5afcf393597506b26ecf31ca debian/bin/gencontrol.py e8f2113c78600fc17eeae209c9fad062 debian/templates/control.main.in a15fa64ce6deead28d33c1581b14dba7 debian/templates/xen-hypervisor.postinst.in diff -Nru xen-4.4.1/debian/patches/armv6.diff xen-4.4.1/debian/patches/armv6.diff --- xen-4.4.1/debian/patches/armv6.diff 1970-01-01 00:00:00.000000000 +0000 +++ xen-4.4.1/debian/patches/armv6.diff 2015-08-30 16:16:06.000000000 +0000 @@ -0,0 +1,18 @@ +Description: replace "dmb" with "mcr p15, #0, r0, c7, c10, #5" for armv6 +Author: Peter Michael Green + +--- xen-4.4.1.orig/tools/libxc/xenctrl.h ++++ xen-4.4.1/tools/libxc/xenctrl.h +@@ -77,9 +77,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") diff -Nru xen-4.4.1/debian/patches/series xen-4.4.1/debian/patches/series --- xen-4.4.1/debian/patches/series 2015-04-06 17:55:05.000000000 +0000 +++ xen-4.4.1/debian/patches/series 2015-08-30 16:15:47.000000000 +0000 @@ -55,3 +55,4 @@ CVE-2014-3969-update-1.diff CVE-2015-2752.diff CVE-2015-2751.diff +armv6.diff