summaryrefslogtreecommitdiff
path: root/drivers/android/binder/range_alloc
diff options
context:
space:
mode:
authorDanilo Krummrich <dakr@kernel.org>2026-05-25 02:40:57 +0200
committerDanilo Krummrich <dakr@kernel.org>2026-05-25 02:40:57 +0200
commit56785dcb2ef6d3cff82ac33f2e34db94377416a3 (patch)
treed591052093e8caaa46e93f17a602924a8bfb9211 /drivers/android/binder/range_alloc
parent024480bf8d75bd16894c5b0eb6082b6e6dae4970 (diff)
parente7ae89a0c97ce2b68b0983cd01eda67cf373517d (diff)
Merge tag 'v7.1-rc5' into driver-core-next
We need the driver-core fixes in here as well to build on top of. Signed-off-by: Danilo Krummrich <dakr@kernel.org>
Diffstat (limited to 'drivers/android/binder/range_alloc')
-rw-r--r--drivers/android/binder/range_alloc/array.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/android/binder/range_alloc/array.rs b/drivers/android/binder/range_alloc/array.rs
index ada1d1b4302e..081d19b09d4b 100644
--- a/drivers/android/binder/range_alloc/array.rs
+++ b/drivers/android/binder/range_alloc/array.rs
@@ -204,7 +204,6 @@ impl<T> ArrayRangeAllocator<T> {
// caller will mark them as unused, which means that they can be freed if the system comes
// under memory pressure.
let mut freed_range = FreedRange::interior_pages(offset, size);
- #[expect(clippy::collapsible_if)] // reads better like this
if offset % PAGE_SIZE != 0 {
if i == 0 || self.ranges[i - 1].endpoint() <= (offset & PAGE_MASK) {
freed_range.start_page_idx -= 1;