summaryrefslogtreecommitdiff
path: root/drivers/android/binder
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2026-01-11 07:27:44 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2026-01-11 07:27:44 -1000
commit9c7ef209cd0f7c1a92ed61eed3e835d6e4abc66c (patch)
tree187bfb72c24eba7cdd47afd5ad908725491fe515 /drivers/android/binder
parent316a94cb6398ea073790462ddd337da06ad8e1de (diff)
parent361e0ff456a8daf9753c18030533256e4133ce7a (diff)
Merge tag 'char-misc-6.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-miscHEADmaster
Pull char/misc driver fixes from Greg KH: "Here are some small char/misc driver fixes for some reported issues. Included in here is: - much reported rust_binder fix - counter driver fixes - new device ids for the mei driver All of these have been in linux-next for a while with no reported issues" * tag 'char-misc-6.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: rust_binder: remove spin_lock() in rust_shrink_free_page() mei: me: add nova lake point S DID counter: 104-quad-8: Fix incorrect return value in IRQ handler counter: interrupt-cnt: Drop IRQF_NO_THREAD flag
Diffstat (limited to 'drivers/android/binder')
-rw-r--r--drivers/android/binder/page_range.rs3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/android/binder/page_range.rs b/drivers/android/binder/page_range.rs
index 9379038f61f5..fdd97112ef5c 100644
--- a/drivers/android/binder/page_range.rs
+++ b/drivers/android/binder/page_range.rs
@@ -727,8 +727,5 @@ unsafe extern "C" fn rust_shrink_free_page(
drop(mm);
drop(page);
- // SAFETY: We just unlocked the lru lock, but it should be locked when we return.
- unsafe { bindings::spin_lock(&raw mut (*lru).lock) };
-
LRU_REMOVED_ENTRY
}