From 04267e40b78d8ebd0e3f9f7212ed57bba12a7cc6 Mon Sep 17 00:00:00 2001 From: Raspbian automatic forward porter Date: Thu, 21 Apr 2022 08:23:44 +0100 Subject: [PATCH] Commit Debian 3.0 (quilt) metadata [dgit (9.14) quilt-fixup] --- ...8eac2f1436a7af474c831ee9dbc9813-1650525821 | 43 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 44 insertions(+) create mode 100644 debian/patches/auto-4.16.0+51-g0941d6cb-1+rpi1-d71dd53be8eac2f1436a7af474c831ee9dbc9813-1650525821 diff --git a/debian/patches/auto-4.16.0+51-g0941d6cb-1+rpi1-d71dd53be8eac2f1436a7af474c831ee9dbc9813-1650525821 b/debian/patches/auto-4.16.0+51-g0941d6cb-1+rpi1-d71dd53be8eac2f1436a7af474c831ee9dbc9813-1650525821 new file mode 100644 index 0000000000..dc0082e623 --- /dev/null +++ b/debian/patches/auto-4.16.0+51-g0941d6cb-1+rpi1-d71dd53be8eac2f1436a7af474c831ee9dbc9813-1650525821 @@ -0,0 +1,43 @@ +From: Raspbian forward porter +Subject: Automatically generated patch (4.16.0+51-g0941d6cb-1+rpi1) + +Last (up to) 3 git changes, FYI: + +commit d71dd53be8eac2f1436a7af474c831ee9dbc9813 +Author: Raspbian automatic forward porter +Date: Thu Apr 21 08:23:35 2022 +0100 + + Defuzz fuzzy quilt patches and/or disable broken quilt patches + +commit 70020fc80943ea8182b170a12be977c34b073247 +Merge: fc803bd07f 01c9f027d2 +Author: Raspbian automatic forward porter +Date: Thu Apr 21 08:23:26 2022 +0100 + + Merge version 4.14.3+32-g9de3671772-1+rpi1 and 4.16.0+51-g0941d6cb-1 to produce 4.16.0+51-g0941d6cb-1+rpi1 + +commit 01c9f027d2774a32bafdf84286a908053d2cb1aa +Merge: 1bfd67745d 526f8ffa01 +Author: Hans van Kranenburg +Date: Sat Feb 19 21:33:00 2022 +0100 + + Declare fast forward / record previous work + + [git-debrebase pseudomerge: stitch] +--- + +--- xen-4.16.0+51-g0941d6cb.orig/tools/include/xenctrl.h ++++ xen-4.16.0+51-g0941d6cb/tools/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") diff --git a/debian/patches/series b/debian/patches/series index 4a9dafba15..671ef4e7b1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -20,3 +20,4 @@ misc/tools-pygrub-remove-static-solaris-support 0020-tools-don-t-build-ship-xenmon.patch 0021-docs-set-date-to-SOURCE_DATE_EPOCH-if-available.patch 0022-xen-arch-x86-make-objdump-output-user-locale-agnosti.patch +auto-4.16.0+51-g0941d6cb-1+rpi1-d71dd53be8eac2f1436a7af474c831ee9dbc9813-1650525821 -- 2.30.2