summaryrefslogtreecommitdiff
path: root/drivers/android/binder_alloc.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2024-09-04 12:15:38 +0200
committerThomas Gleixner <tglx@linutronix.de>2024-09-04 12:15:38 +0200
commiteb876ea724835126f215c9a5bcc9e6148e2a6d15 (patch)
tree689c215270b023c2f94a6629c7f1d3ef8e49c28a /drivers/android/binder_alloc.c
parent2dce993165088dbe728faa21547e3b74213b6732 (diff)
parent67784a74e258a467225f0e68335df77acd67b7ab (diff)
Merge branch 'linus' into smp/core
Pull in upstream changes so further patches don't conflict.
Diffstat (limited to 'drivers/android/binder_alloc.c')
-rw-r--r--drivers/android/binder_alloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c
index b00961944ab1d..b3acbc4174fb1 100644
--- a/drivers/android/binder_alloc.c
+++ b/drivers/android/binder_alloc.c
@@ -939,9 +939,9 @@ void binder_alloc_deferred_release(struct binder_alloc *alloc)
__free_page(alloc->pages[i].page_ptr);
page_count++;
}
- kvfree(alloc->pages);
}
spin_unlock(&alloc->lock);
+ kvfree(alloc->pages);
if (alloc->mm)
mmdrop(alloc->mm);