From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3B4E83BC69C for ; Tue, 7 Jul 2026 22:14:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783462491; cv=none; b=qBKvpmliEBzA/1uCdS0bewqlyeT2h7BAc1kU8CfwX0/e9CBxlMNHdhvLcQTaUkYsuJBOtNPs6ivW0VeTz1I6keuPWekCc0Q9vo2FFpDdYqBkdyMWlk/jY58S++viik86EH72QXPaptxk1/hV+SNUqAYJISKrM1oEknE9RvQGAv4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783462491; c=relaxed/simple; bh=JzxxcBC97Sor9f9GwFml0oZMnTzjdHeYGfx2Rwa8s+Y=; h=Mime-Version:Content-Type:Date:Message-Id:Cc:Subject:From:To: References:In-Reply-To; b=hFV+hAm94vEzzdMVhnz9hyYnXurEbRe1Tl2AzpKlCMX9S2Rbdb64p0jvIJ8SLleL0xtaivcJQiAWfkyQExwHDSNJKD24Z4EijFhPMTSpSLZFtW+a5twlsQmvMjE22ETxNPcqis0XLCgXywh8HBGBvvW3yFXkomI/nUvxUTP3yQo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=etsalapatis.com; spf=pass smtp.mailfrom=etsalapatis.com; dkim=pass (2048-bit key) header.d=etsalapatis-com.20251104.gappssmtp.com header.i=@etsalapatis-com.20251104.gappssmtp.com header.b=cxE3buOV; arc=none smtp.client-ip=209.85.216.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=etsalapatis.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=etsalapatis.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=etsalapatis-com.20251104.gappssmtp.com header.i=@etsalapatis-com.20251104.gappssmtp.com header.b="cxE3buOV" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-3811074a8c5so42414a91.1 for ; Tue, 07 Jul 2026 15:14:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=etsalapatis-com.20251104.gappssmtp.com; s=20251104; t=1783462488; x=1784067288; darn=vger.kernel.org; h=in-reply-to:references:to:from:subject:cc:message-id:date :content-type:content-transfer-encoding:mime-version:from:to:cc :subject:date:message-id:reply-to:content-type; bh=UHjQx374wW2QisG9IVz0uGu/xnE3OJUz62o+14Y1zuU=; b=cxE3buOVDkoMak6HB7Scb8zID1bbcyCkobcqgLdOAKg4lOoZCaLTNsoMsVHhSTK2a1 OAXK1JYPZZW9FKWsa6hUrX2p7gS2htfVtT2WqBr1xd2oMJIuroHCdaDya4J13UMNyBJl RzYN3tUX0BDLbvxLj0kFUANu+jTYJjcoPdr59tD90FEAmwem5uDb14MxWTwQO4G9nCxB jOVAzVDFXBA7bsCyl8HTKTXeq/qDlfTKxQHY9BC1lFoXURYTeu3JOlIdyKwXI7ebvKcX Ix9By8Sa8cuPufsVT0OIkajCMN16tDamSXuqTMJV9v4w99yViyE56MH6kufDV9iIHnPv 2wlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783462488; x=1784067288; h=in-reply-to:references:to:from:subject:cc:message-id:date :content-type:content-transfer-encoding:mime-version:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=UHjQx374wW2QisG9IVz0uGu/xnE3OJUz62o+14Y1zuU=; b=KN+8NqBjvXSzX4aqY1xsOSfXHjUFOUundHjKjJlPItTugZPbltxH5SyzOBh9G7hvbJ VtFuhNN04z0rnQd7ki2ZLeDgenBU+aRaByB+jQn/72g33tGtccYZQFXlnns14gj8kMYy mTiplbF+rG/uyNTlnf1ecO8ybX8npGuxk6QriAfJ9uewujG0mqE1Musjs1hHjLsLmrbz CuO8H4lixprgmlRPog0DXijmL/SaICaARvKU8MwLFHvWcoJGnAZy1ad2Ha/vGzfaN7gS TE3tz9zkEuUx6jDeg2EcVoWnkFU35WVdiWVHbK37E+5ND096KWS1cmGTSiY2XxXKZZCG J+jQ== X-Forwarded-Encrypted: i=1; AHgh+RrK/hPFlswaybAzZwxfD42xZt5nd9KwF5UQcCmU+1JqIM8u5ZyyN66QlP+stQ0O2RBclo4=@vger.kernel.org X-Gm-Message-State: AOJu0YxDIXMi9qjv6sleYtyl8GhCXBj0hiorYj0LL9xvMwCa76oRA7MD yi7rGyieSrTUsYHH5Eg9XMOBV4LUky8SzeeBhxjb5vOpI1atT+5SNMM0ouY5425+O7w= X-Gm-Gg: AfdE7cnQQeHjTnHIT3pMfx0pVU4A1G0rMjKq+coQe550h0AGGHZslIUx4iFzKExIsla rg6y2h5Wrso5qZZ+7vQaTpFGtZrVvNvJZy4be5JOh0JxqPxMwA6bk5rHPAdZpvH0IGisZJouizs zV34t14Ybwmp6kTZXq2YyTrMqqFbXKSSUW4k1YP8fDnqS1fiPa+eLUwparLPF2vZwr9aojPgDJL V/lJFy6N9OsP1hCycd/IOz5DC6mkAM8ViENdAFptLnBI3UmjGk87zP0W6TlFaDSeeFzYitANL2S SPPUg1Rr4hzb59ci/HLKcDxRBSg2xm5+bSV0wp7m21PGy0O01RVkhvTje5tjiYrLCt3lQpYze5K GNWy07LIWzuCpgAe6Pjp/wCZ81Aj5QDZI9LLkHBgEBbmKGn1LXHAcS3gNzAZK0ANz2ZxKXMM6cD PK7/AGJbZIaHz6ijphj4TsUkCyrU0XSqxz27Yw1aRAdtfcKXyAPw0f X-Received: by 2002:a05:6a20:2586:b0:3c0:9c19:b277 with SMTP id adf61e73a8af0-3c09c19b31bmr5325736637.69.1783462488311; Tue, 07 Jul 2026 15:14:48 -0700 (PDT) Received: from localhost (107-190-31-17.cpe.teksavvy.com. [107.190.31.17]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-ca5af7d595dsm1609858a12.6.2026.07.07.15.14.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 07 Jul 2026 15:14:47 -0700 (PDT) Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Tue, 07 Jul 2026 18:14:47 -0400 Message-Id: Cc: "Alexei Starovoitov" , "Andrii Nakryiko" , "Daniel Borkmann" , , "Martin KaFai Lau" , "Emil Tsalapatis" Subject: Re: [PATCH bpf-next] selftests/bpf: Rename libarena struct bitmap to struct arena_bitmap From: "Emil Tsalapatis" To: "Yonghong Song" , X-Mailer: aerc 0.21.0-0-g5549850facc2 References: <20260707220136.910374-1-yonghong.song@linux.dev> In-Reply-To: <20260707220136.910374-1-yonghong.song@linux.dev> On Tue Jul 7, 2026 at 6:01 PM EDT, Yonghong Song wrote: > When building bpf selftest with latest bpf-next, I got the following fail= ure: > > In file included from /home/yhs/work/bpf-next/tools/testing/selftests/b= pf/libarena/selftests/test_parallel_bitmap.bpf.c:8: > /home/yhs/work/bpf-next/tools/testing/selftests/bpf/libarena/include/li= barena/bitmap.h:11:8: error: redefinition of > 'bitmap' > 11 | struct bitmap { > | ^ > /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/include/vmlin= ux.h:51320:8: note: previous definition is here > 51320 | struct bitmap { > | ^ > > The vmlinux.h struct bitmap comes from drivers/md/md-bitmap.c: > struct bitmap { > struct bitmap_counts { ... } > ... > } > > To fix the issue, I renamed libarena struct bitmap to arena_bitmap to avo= id the conflict. > > Cc: Emil Tsalapatis > Signed-off-by: Yonghong Song Reviewed-by: Emil Tsalapatis The arena_bitmap name is a bit longer but truncating it would be more confusing. > --- > .../bpf/libarena/include/libarena/bitmap.h | 36 +++++++++--------- > .../bpf/libarena/selftests/test_bitmap.bpf.c | 24 ++++++------ > .../selftests/test_parallel_bitmap.bpf.c | 2 +- > .../selftests/bpf/libarena/src/bitmap.bpf.c | 38 +++++++++---------- > 4 files changed, 50 insertions(+), 50 deletions(-) > > diff --git a/tools/testing/selftests/bpf/libarena/include/libarena/bitmap= .h b/tools/testing/selftests/bpf/libarena/include/libarena/bitmap.h > index cf6b63f5d9a4..e2431ea6fdd6 100644 > --- a/tools/testing/selftests/bpf/libarena/include/libarena/bitmap.h > +++ b/tools/testing/selftests/bpf/libarena/include/libarena/bitmap.h > @@ -8,27 +8,27 @@ > #define BIT_MASK(nr) (1ULL << ((nr) % BITS_PER_LONG_LONG)) > #define BIT_WORD(nr) ((nr) / BITS_PER_LONG_LONG) > =20 > -struct bitmap { > +struct arena_bitmap { > u64 bits[0]; > }; > =20 > -struct bitmap __arena *bmp_alloc(size_t bits); > -void bmp_free(struct bitmap __arena *bmp); > +struct arena_bitmap __arena *bmp_alloc(size_t bits); > +void bmp_free(struct arena_bitmap __arena *bmp); > =20 > -void __bmp_set_bit(u32 bit, struct bitmap __arena *bmp); > -void __bmp_clear_bit(u32 bit, struct bitmap __arena *bmp); > -void bmp_set_bit(u32 bit, struct bitmap __arena *bmp); > -void bmp_clear_bit(u32 bit, struct bitmap __arena *bmp); > -bool bmp_test_bit(u32 bit, struct bitmap __arena *bmp); > -bool bmp_test_and_clear_bit(u32 bit, struct bitmap __arena *bmp); > -bool bmp_test_and_set_bit(u32 bit, struct bitmap __arena *bmp); > +void __bmp_set_bit(u32 bit, struct arena_bitmap __arena *bmp); > +void __bmp_clear_bit(u32 bit, struct arena_bitmap __arena *bmp); > +void bmp_set_bit(u32 bit, struct arena_bitmap __arena *bmp); > +void bmp_clear_bit(u32 bit, struct arena_bitmap __arena *bmp); > +bool bmp_test_bit(u32 bit, struct arena_bitmap __arena *bmp); > +bool bmp_test_and_clear_bit(u32 bit, struct arena_bitmap __arena *bmp); > +bool bmp_test_and_set_bit(u32 bit, struct arena_bitmap __arena *bmp); > =20 > -void bmp_clear(size_t bits, struct bitmap __arena *bmp); > -void bmp_and(size_t bits, struct bitmap __arena *dst, struct bitmap __ar= ena *src1, struct bitmap __arena *src2); > -void bmp_or(size_t bits, struct bitmap __arena *dst, struct bitmap __are= na *src1, struct bitmap __arena *src2); > -bool bmp_empty(size_t bits, struct bitmap __arena *bmp); > -void bmp_copy(size_t bits, struct bitmap __arena *dst, struct bitmap __a= rena *src); > +void bmp_clear(size_t bits, struct arena_bitmap __arena *bmp); > +void bmp_and(size_t bits, struct arena_bitmap __arena *dst, struct arena= _bitmap __arena *src1, struct arena_bitmap __arena *src2); > +void bmp_or(size_t bits, struct arena_bitmap __arena *dst, struct arena_= bitmap __arena *src1, struct arena_bitmap __arena *src2); > +bool bmp_empty(size_t bits, struct arena_bitmap __arena *bmp); > +void bmp_copy(size_t bits, struct arena_bitmap __arena *dst, struct aren= a_bitmap __arena *src); > =20 > -bool bmp_intersects(size_t bits, struct bitmap __arena *arg1, struct bit= map __arena *arg2); > -bool bmp_subset(size_t bits, struct bitmap __arena *big, struct bitmap _= _arena *small); > -void bmp_print(size_t bits, struct bitmap __arena *bmp); > +bool bmp_intersects(size_t bits, struct arena_bitmap __arena *arg1, stru= ct arena_bitmap __arena *arg2); > +bool bmp_subset(size_t bits, struct arena_bitmap __arena *big, struct ar= ena_bitmap __arena *small); > +void bmp_print(size_t bits, struct arena_bitmap __arena *bmp); > diff --git a/tools/testing/selftests/bpf/libarena/selftests/test_bitmap.b= pf.c b/tools/testing/selftests/bpf/libarena/selftests/test_bitmap.bpf.c > index e7d32f44d687..76319a529f02 100644 > --- a/tools/testing/selftests/bpf/libarena/selftests/test_bitmap.bpf.c > +++ b/tools/testing/selftests/bpf/libarena/selftests/test_bitmap.bpf.c > @@ -8,7 +8,7 @@ > #define MID_BIT (BITS_PER_LONG_LONG + 1) > #define LAST_BIT (TEST_BITS - 1) > =20 > -static void test_bmp_setall(struct bitmap __arena *bmp) > +static void test_bmp_setall(struct arena_bitmap __arena *bmp) > { > volatile u32 i; > =20 > @@ -19,7 +19,7 @@ static void test_bmp_setall(struct bitmap __arena *bmp) > SEC("syscall") > __weak int test_bitmap_alloc_free(void) > { > - struct bitmap __arena *bmp; > + struct arena_bitmap __arena *bmp; > =20 > bmp =3D bmp_alloc(TEST_BITS); > if (!bmp) > @@ -47,7 +47,7 @@ __weak int test_bitmap_alloc_free(void) > SEC("syscall") > __weak int test_bitmap_bit_ops(void) > { > - struct bitmap __arena *bmp; > + struct arena_bitmap __arena *bmp; > =20 > bmp =3D bmp_alloc(TEST_BITS); > if (!bmp) > @@ -97,7 +97,7 @@ __weak int test_bitmap_bit_ops(void) > return -EINVAL; > } > =20 > -static bool test_bitmap_test_and_clear_single(struct bitmap __arena *bmp= , size_t ind) > +static bool test_bitmap_test_and_clear_single(struct arena_bitmap __aren= a *bmp, size_t ind) > { > if (bmp_test_and_clear_bit(ind, bmp)) > return false; > @@ -116,7 +116,7 @@ static bool test_bitmap_test_and_clear_single(struct = bitmap __arena *bmp, size_t > return true; > } > =20 > -static bool test_bitmap_test_and_set_single(struct bitmap __arena *bmp, = size_t ind) > +static bool test_bitmap_test_and_set_single(struct arena_bitmap __arena = *bmp, size_t ind) > { > if (bmp_test_and_set_bit(ind, bmp)) > return false; > @@ -138,7 +138,7 @@ static bool test_bitmap_test_and_set_single(struct bi= tmap __arena *bmp, size_t i > SEC("syscall") > __weak int test_bitmap_test_and_clear_bit(void) > { > - struct bitmap __arena *bmp; > + struct arena_bitmap __arena *bmp; > =20 > bmp =3D bmp_alloc(TEST_BITS); > if (!bmp) > @@ -167,7 +167,7 @@ __weak int test_bitmap_test_and_clear_bit(void) > SEC("syscall") > __weak int test_bitmap_test_and_set_bit(void) > { > - struct bitmap __arena *bmp; > + struct arena_bitmap __arena *bmp; > =20 > bmp =3D bmp_alloc(TEST_BITS); > if (!bmp) > @@ -194,7 +194,7 @@ __weak int test_bitmap_test_and_set_bit(void) > SEC("syscall") > __weak int test_bitmap_and(void) > { > - struct bitmap __arena *src1 =3D NULL, *src2 =3D NULL, *dst =3D NULL; > + struct arena_bitmap __arena *src1 =3D NULL, *src2 =3D NULL, *dst =3D NU= LL; > =20 > src1 =3D bmp_alloc(TEST_BITS); > src2 =3D bmp_alloc(TEST_BITS); > @@ -240,7 +240,7 @@ __weak int test_bitmap_and(void) > SEC("syscall") > __weak int test_bitmap_or(void) > { > - struct bitmap __arena *src1 =3D NULL, *src2 =3D NULL, *dst =3D NULL; > + struct arena_bitmap __arena *src1 =3D NULL, *src2 =3D NULL, *dst =3D NU= LL; > =20 > src1 =3D bmp_alloc(TEST_BITS); > src2 =3D bmp_alloc(TEST_BITS); > @@ -285,7 +285,7 @@ __weak int test_bitmap_or(void) > SEC("syscall") > __weak int test_bitmap_subset(void) > { > - struct bitmap __arena *big =3D NULL, *small =3D NULL; > + struct arena_bitmap __arena *big =3D NULL, *small =3D NULL; > =20 > big =3D bmp_alloc(TEST_BITS); > small =3D bmp_alloc(TEST_BITS); > @@ -329,7 +329,7 @@ __weak int test_bitmap_subset(void) > SEC("syscall") > __weak int test_bitmap_intersects(void) > { > - struct bitmap __arena *arg1 =3D NULL, *arg2 =3D NULL; > + struct arena_bitmap __arena *arg1 =3D NULL, *arg2 =3D NULL; > =20 > arg1 =3D bmp_alloc(TEST_BITS); > arg2 =3D bmp_alloc(TEST_BITS); > @@ -362,7 +362,7 @@ __weak int test_bitmap_intersects(void) > SEC("syscall") > __weak int test_bitmap_copy(void) > { > - struct bitmap __arena *arg1 =3D NULL, *arg2 =3D NULL; > + struct arena_bitmap __arena *arg1 =3D NULL, *arg2 =3D NULL; > =20 > arg1 =3D bmp_alloc(TEST_BITS); > arg2 =3D bmp_alloc(TEST_BITS); > diff --git a/tools/testing/selftests/bpf/libarena/selftests/test_parallel= _bitmap.bpf.c b/tools/testing/selftests/bpf/libarena/selftests/test_paralle= l_bitmap.bpf.c > index eec2871e2b0d..ea1fac95b461 100644 > --- a/tools/testing/selftests/bpf/libarena/selftests/test_parallel_bitmap= .bpf.c > +++ b/tools/testing/selftests/bpf/libarena/selftests/test_parallel_bitmap= .bpf.c > @@ -12,7 +12,7 @@ > #define TEST_BITMAP_SYNC_SPINS BPF_MAX_LOOPS > #define TEST_BITMAP_ITERS 10 * 1000 * 1000 > =20 > -static struct bitmap __arena *bitmap; > +static struct arena_bitmap __arena *bitmap; > static volatile u64 started; > static volatile bool test_abort; > =20 > diff --git a/tools/testing/selftests/bpf/libarena/src/bitmap.bpf.c b/tool= s/testing/selftests/bpf/libarena/src/bitmap.bpf.c > index 80e814401fb9..5ff8e688ddc7 100644 > --- a/tools/testing/selftests/bpf/libarena/src/bitmap.bpf.c > +++ b/tools/testing/selftests/bpf/libarena/src/bitmap.bpf.c > @@ -10,16 +10,16 @@ > #include > =20 > __weak > -struct bitmap __arena *bmp_alloc(size_t bits) > +struct arena_bitmap __arena *bmp_alloc(size_t bits) > { > - struct bitmap __arena *bmp; > + struct arena_bitmap __arena *bmp; > size_t size =3D BITS_TO_LONG_LONGS(bits) * sizeof(bmp->bits[0]); > =20 > /* Assume long-aligned masks. */ > if (bits % BITS_PER_LONG_LONG) > return NULL; > =20 > - bmp =3D (struct bitmap __arena *)arena_malloc(size); > + bmp =3D (struct arena_bitmap __arena *)arena_malloc(size); > if (!bmp) > return NULL; > =20 > @@ -29,31 +29,31 @@ struct bitmap __arena *bmp_alloc(size_t bits) > } > =20 > __weak > -void bmp_free(struct bitmap __arena *bmp) > +void bmp_free(struct arena_bitmap __arena *bmp) > { > arena_free(bmp); > } > =20 > __weak > -void __bmp_set_bit(u32 bit, struct bitmap __arena *bmp) > +void __bmp_set_bit(u32 bit, struct arena_bitmap __arena *bmp) > { > bmp->bits[BIT_WORD(bit)] |=3D BIT_MASK(bit); > } > =20 > __weak > -void __bmp_clear_bit(u32 bit, struct bitmap __arena *bmp) > +void __bmp_clear_bit(u32 bit, struct arena_bitmap __arena *bmp) > { > bmp->bits[BIT_WORD(bit)] &=3D ~BIT_MASK(bit); > } > =20 > __weak > -bool bmp_test_bit(u32 bit, struct bitmap __arena *bmp) > +bool bmp_test_bit(u32 bit, struct arena_bitmap __arena *bmp) > { > return bmp->bits[BIT_WORD(bit)] & BIT_MASK(bit); > } > =20 > __weak > -bool bmp_test_and_clear_bit(u32 bit, struct bitmap __arena *bmp) > +bool bmp_test_and_clear_bit(u32 bit, struct arena_bitmap __arena *bmp) > { > u64 val =3D BIT_MASK(bit); > u32 idx =3D BIT_WORD(bit); > @@ -77,7 +77,7 @@ bool bmp_test_and_clear_bit(u32 bit, struct bitmap __ar= ena *bmp) > } > =20 > __weak > -bool bmp_test_and_set_bit(u32 bit, struct bitmap __arena *bmp) > +bool bmp_test_and_set_bit(u32 bit, struct arena_bitmap __arena *bmp) > { > u64 val =3D BIT_MASK(bit); > u32 idx =3D BIT_WORD(bit); > @@ -101,7 +101,7 @@ bool bmp_test_and_set_bit(u32 bit, struct bitmap __ar= ena *bmp) > } > =20 > __weak > -void bmp_clear_bit(u32 bit, struct bitmap __arena *bmp) > +void bmp_clear_bit(u32 bit, struct arena_bitmap __arena *bmp) > { > u64 val =3D BIT_MASK(bit); > u32 idx =3D BIT_WORD(bit); > @@ -116,7 +116,7 @@ void bmp_clear_bit(u32 bit, struct bitmap __arena *bm= p) > } > =20 > __weak > -void bmp_set_bit(u32 bit, struct bitmap __arena *bmp) > +void bmp_set_bit(u32 bit, struct arena_bitmap __arena *bmp) > { > u64 val =3D BIT_MASK(bit); > u32 idx =3D BIT_WORD(bit); > @@ -131,7 +131,7 @@ void bmp_set_bit(u32 bit, struct bitmap __arena *bmp) > } > =20 > __weak > -void bmp_clear(size_t bits, struct bitmap __arena *bmp) > +void bmp_clear(size_t bits, struct arena_bitmap __arena *bmp) > { > size_t nwords =3D BITS_TO_LONG_LONGS(bits); > volatile u32 i; > @@ -148,7 +148,7 @@ static __always_inline u64 bmp_last_word_mask(size_t = bits) > } > =20 > __weak > -void bmp_and(size_t bits, struct bitmap __arena *dst, struct bitmap __ar= ena *src1, struct bitmap __arena *src2) > +void bmp_and(size_t bits, struct arena_bitmap __arena *dst, struct arena= _bitmap __arena *src1, struct arena_bitmap __arena *src2) > { > size_t nwords =3D BITS_TO_LONG_LONGS(bits); > volatile u32 i; > @@ -161,7 +161,7 @@ void bmp_and(size_t bits, struct bitmap __arena *dst,= struct bitmap __arena *src > } > =20 > __weak > -void bmp_or(size_t bits, struct bitmap __arena *dst, struct bitmap __are= na *src1, struct bitmap __arena *src2) > +void bmp_or(size_t bits, struct arena_bitmap __arena *dst, struct arena_= bitmap __arena *src1, struct arena_bitmap __arena *src2) > { > size_t nwords =3D BITS_TO_LONG_LONGS(bits); > volatile u32 i; > @@ -174,7 +174,7 @@ void bmp_or(size_t bits, struct bitmap __arena *dst, = struct bitmap __arena *src1 > } > =20 > __weak > -bool bmp_empty(size_t bits, struct bitmap __arena *bmp) > +bool bmp_empty(size_t bits, struct arena_bitmap __arena *bmp) > { > size_t nwords =3D BITS_TO_LONG_LONGS(bits); > volatile u32 i; > @@ -190,7 +190,7 @@ bool bmp_empty(size_t bits, struct bitmap __arena *bm= p) > } > =20 > __weak > -void bmp_copy(size_t bits, struct bitmap __arena *dst, struct bitmap __a= rena *src) > +void bmp_copy(size_t bits, struct arena_bitmap __arena *dst, struct aren= a_bitmap __arena *src) > { > size_t nwords =3D BITS_TO_LONG_LONGS(bits); > volatile u32 i; > @@ -203,7 +203,7 @@ void bmp_copy(size_t bits, struct bitmap __arena *dst= , struct bitmap __arena *sr > } > =20 > __weak > -bool bmp_subset(size_t bits, struct bitmap __arena *big, struct bitmap _= _arena *small) > +bool bmp_subset(size_t bits, struct arena_bitmap __arena *big, struct ar= ena_bitmap __arena *small) > { > size_t nwords =3D BITS_TO_LONG_LONGS(bits); > volatile u32 i; > @@ -219,7 +219,7 @@ bool bmp_subset(size_t bits, struct bitmap __arena *b= ig, struct bitmap __arena * > } > =20 > __weak > -bool bmp_intersects(size_t bits, struct bitmap __arena *arg1, struct bit= map __arena *arg2) > +bool bmp_intersects(size_t bits, struct arena_bitmap __arena *arg1, stru= ct arena_bitmap __arena *arg2) > { > size_t nwords =3D BITS_TO_LONG_LONGS(bits); > volatile u32 i; > @@ -235,7 +235,7 @@ bool bmp_intersects(size_t bits, struct bitmap __aren= a *arg1, struct bitmap __ar > } > =20 > __weak > -void bmp_print(size_t bits, struct bitmap __arena *bmp) > +void bmp_print(size_t bits, struct arena_bitmap __arena *bmp) > { > size_t nwords =3D BITS_TO_LONG_LONGS(bits); > volatile u32 i;