diff -Nru libbpf-0.3/debian/changelog libbpf-0.3/debian/changelog --- libbpf-0.3/debian/changelog 2021-01-10 17:43:30.000000000 +0000 +++ libbpf-0.3/debian/changelog 2021-01-22 12:08:45.000000000 +0000 @@ -1,3 +1,10 @@ +libbpf (0.3-2+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 0.3-1+rpi1 by Peter Michael Green at Thu, 07 Jan 2021 03:30:15 +0000] + * Disable use of dmb on arm, it's not approprpriate for raspbian. + + -- Raspbian forward porter Fri, 22 Jan 2021 12:08:45 +0000 + libbpf (0.3-2) unstable; urgency=medium [ Luca Boccassi ] diff -Nru libbpf-0.3/debian/patches/dont-use-dmb.patch libbpf-0.3/debian/patches/dont-use-dmb.patch --- libbpf-0.3/debian/patches/dont-use-dmb.patch 1970-01-01 00:00:00.000000000 +0000 +++ libbpf-0.3/debian/patches/dont-use-dmb.patch 2021-01-22 12:08:45.000000000 +0000 @@ -0,0 +1,14 @@ +Description: Disable use of dmb on arm, it's not approprpriate for raspbian. +Author: Peter Michael Green + +--- libbpf-0.3.orig/src/libbpf_util.h ++++ libbpf-0.3/src/libbpf_util.h +@@ -26,7 +26,7 @@ extern "C" { + # define libbpf_smp_wmb() asm volatile("dmb ishst" : : : "memory") + # define libbpf_smp_mb() asm volatile("dmb ish" : : : "memory") + # define libbpf_smp_rwmb() libbpf_smp_mb() +-#elif defined(__arm__) ++#elif 0 + /* These are only valid for armv7 and above */ + # define libbpf_smp_rmb() asm volatile("dmb ish" : : : "memory") + # define libbpf_smp_wmb() asm volatile("dmb ishst" : : : "memory") diff -Nru libbpf-0.3/debian/patches/series libbpf-0.3/debian/patches/series --- libbpf-0.3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ libbpf-0.3/debian/patches/series 2021-01-22 12:08:45.000000000 +0000 @@ -0,0 +1 @@ +dont-use-dmb.patch