From nobody Mon Apr 6 14:10:06 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBFD4ECAAD5 for ; Tue, 6 Sep 2022 14:41:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240112AbiIFOlk (ORCPT ); Tue, 6 Sep 2022 10:41:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242351AbiIFOjL (ORCPT ); Tue, 6 Sep 2022 10:39:11 -0400 Received: from mail-pl1-x64a.google.com (mail-pl1-x64a.google.com [IPv6:2607:f8b0:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CD9483F03 for ; Tue, 6 Sep 2022 07:01:11 -0700 (PDT) Received: by mail-pl1-x64a.google.com with SMTP id j6-20020a170902da8600b00176a4279ba4so4079177plx.18 for ; Tue, 06 Sep 2022 07:01:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date; bh=2iqiRoRfI36tlnsgrgLfPSRPdRupjE9Pp67XbsjYly0=; b=FJNt4yzR1tqqVD7b94MqM0o6NGe/NKEGqyWS1EReZ+MxJS1kjyqazZLpTY4oekYzs7 Sng9fkDy2iMwDpVYVyArnXX4EL1AFcW+vtwK38W/dEISkHGGz9tJc2Anw8mV2TuWAJ1x k1wBMYd6KwUVQa9EOnjuz8+C8U36lsX3ORfPBcZ1BusJCpH1LwTMjK6+RI+aDInCa+gf l9xGkTL7Re6HoZMsJeLl5T6wS5rb59mMfqqIgOL5me4LHPIlWJesiVB8i4nd0H8PUhYk ZqDBLK4jf+xBnDVIk2hS/kHsU68K7a7kCXkWQDCPGqhA9zUKivfMVCbcPJqpTPPXDjei WzOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date; bh=2iqiRoRfI36tlnsgrgLfPSRPdRupjE9Pp67XbsjYly0=; b=3ssc5XJZ4N7aqrvu59prQvaULQLtD4ET6GKyLYpwRunRGoXpyQv7b5GHtYuNoVMFb9 0eOZh0ZlfNoL3Vf+HJ19rjjePmwZqo2pRRXYaAjvuOzMo7Kdvy+bJqUpixo0Vv+Ppix2 5eS/6zPdIIAHE5s3EVPO05lmDUoB0hYNuyXHuGpzl9tMDbb8mg667R4yaBck77Yx9E4v E8XFTfRF9ly4Z48D4QXNGOMUHIVfvfkhHHp9/7+yvIYKPDteY8am3ILbkhyrEwYtqZ68 mD4TI3RvK851q7lEPhXwE8ZwhnO3PHlZwAlgNasHNxCTm4pKH24sAomYsktDG+MOrvi5 +17Q== X-Gm-Message-State: ACgBeo3K5sR7smFQXTXqfzUVVOKeqxvtxQpWivPV/8OGDNUdoIFHV70I mUkaT1ifacGEr+P2rzRudV8gtqUdkOVYFQ== X-Google-Smtp-Source: AA6agR5YYsr/GVCs9t6zlz+hfvPQyJdxROPp63UBu2hEbJkjuAoirddkE5tRjPY9YaqrPuRbCNnUfs83/DtQbA== X-Received: from xllamas.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5070]) (user=cmllamas job=sendgmr) by 2002:a17:90b:164f:b0:1f5:4ced:ed81 with SMTP id il15-20020a17090b164f00b001f54ceded81mr24638688pjb.122.1662472799293; Tue, 06 Sep 2022 06:59:59 -0700 (PDT) Date: Tue, 6 Sep 2022 13:59:45 +0000 In-Reply-To: <20220906135948.3048225-1-cmllamas@google.com> Mime-Version: 1.0 References: <20220906135948.3048225-1-cmllamas@google.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220906135948.3048225-2-cmllamas@google.com> Subject: [PATCH RESEND 1/3] binder: rename alloc->vma_vm_mm to alloc->mm From: Carlos Llamas To: Greg Kroah-Hartman , "=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=" , Todd Kjos , Martijn Coenen , Joel Fernandes , Christian Brauner , Carlos Llamas , Suren Baghdasaryan Cc: kernel-team@android.com, Todd Kjos , linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename ->vma_vm_mm to ->mm to reflect the fact that we no longer cache this reference from vma->vm_mm but from current->mm instead. No functional changes in this patch. Signed-off-by: Carlos Llamas Reviewed-by: Christian Brauner (Microsoft) Acked-by: Todd Kjos --- drivers/android/binder_alloc.c | 34 +++++++++++++++++----------------- drivers/android/binder_alloc.h | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c index 9b1778c00610..749a4cd30a83 100644 --- a/drivers/android/binder_alloc.c +++ b/drivers/android/binder_alloc.c @@ -208,8 +208,8 @@ static int binder_update_page_range(struct binder_alloc= *alloc, int allocate, } } =20 - if (need_mm && mmget_not_zero(alloc->vma_vm_mm)) - mm =3D alloc->vma_vm_mm; + if (need_mm && mmget_not_zero(alloc->mm)) + mm =3D alloc->mm; =20 if (mm) { mmap_read_lock(mm); @@ -322,9 +322,9 @@ static inline void binder_alloc_set_vma(struct binder_a= lloc *alloc, */ if (vma) { vm_start =3D vma->vm_start; - mmap_assert_write_locked(alloc->vma_vm_mm); + mmap_assert_write_locked(alloc->mm); } else { - mmap_assert_locked(alloc->vma_vm_mm); + mmap_assert_locked(alloc->mm); } =20 alloc->vma_addr =3D vm_start; @@ -336,7 +336,7 @@ static inline struct vm_area_struct *binder_alloc_get_v= ma( struct vm_area_struct *vma =3D NULL; =20 if (alloc->vma_addr) - vma =3D vma_lookup(alloc->vma_vm_mm, alloc->vma_addr); + vma =3D vma_lookup(alloc->mm, alloc->vma_addr); =20 return vma; } @@ -401,15 +401,15 @@ static struct binder_buffer *binder_alloc_new_buf_loc= ked( size_t size, data_offsets_size; int ret; =20 - mmap_read_lock(alloc->vma_vm_mm); + mmap_read_lock(alloc->mm); if (!binder_alloc_get_vma(alloc)) { - mmap_read_unlock(alloc->vma_vm_mm); + mmap_read_unlock(alloc->mm); binder_alloc_debug(BINDER_DEBUG_USER_ERROR, "%d: binder_alloc_buf, no vma\n", alloc->pid); return ERR_PTR(-ESRCH); } - mmap_read_unlock(alloc->vma_vm_mm); + mmap_read_unlock(alloc->mm); =20 data_offsets_size =3D ALIGN(data_size, sizeof(void *)) + ALIGN(offsets_size, sizeof(void *)); @@ -823,7 +823,7 @@ void binder_alloc_deferred_release(struct binder_alloc = *alloc) buffers =3D 0; mutex_lock(&alloc->mutex); BUG_ON(alloc->vma_addr && - vma_lookup(alloc->vma_vm_mm, alloc->vma_addr)); + vma_lookup(alloc->mm, alloc->vma_addr)); =20 while ((n =3D rb_first(&alloc->allocated_buffers))) { buffer =3D rb_entry(n, struct binder_buffer, rb_node); @@ -873,8 +873,8 @@ void binder_alloc_deferred_release(struct binder_alloc = *alloc) kfree(alloc->pages); } mutex_unlock(&alloc->mutex); - if (alloc->vma_vm_mm) - mmdrop(alloc->vma_vm_mm); + if (alloc->mm) + mmdrop(alloc->mm); =20 binder_alloc_debug(BINDER_DEBUG_OPEN_CLOSE, "%s: %d buffers %d, pages %d\n", @@ -931,13 +931,13 @@ void binder_alloc_print_pages(struct seq_file *m, * read inconsistent state. */ =20 - mmap_read_lock(alloc->vma_vm_mm); + mmap_read_lock(alloc->mm); if (binder_alloc_get_vma(alloc) =3D=3D NULL) { - mmap_read_unlock(alloc->vma_vm_mm); + mmap_read_unlock(alloc->mm); goto uninitialized; } =20 - mmap_read_unlock(alloc->vma_vm_mm); + mmap_read_unlock(alloc->mm); for (i =3D 0; i < alloc->buffer_size / PAGE_SIZE; i++) { page =3D &alloc->pages[i]; if (!page->page_ptr) @@ -1020,7 +1020,7 @@ enum lru_status binder_alloc_free_page(struct list_he= ad *item, index =3D page - alloc->pages; page_addr =3D (uintptr_t)alloc->buffer + index * PAGE_SIZE; =20 - mm =3D alloc->vma_vm_mm; + mm =3D alloc->mm; if (!mmget_not_zero(mm)) goto err_mmget; if (!mmap_read_trylock(mm)) @@ -1089,8 +1089,8 @@ static struct shrinker binder_shrinker =3D { void binder_alloc_init(struct binder_alloc *alloc) { alloc->pid =3D current->group_leader->pid; - alloc->vma_vm_mm =3D current->mm; - mmgrab(alloc->vma_vm_mm); + alloc->mm =3D current->mm; + mmgrab(alloc->mm); mutex_init(&alloc->mutex); INIT_LIST_HEAD(&alloc->buffers); } diff --git a/drivers/android/binder_alloc.h b/drivers/android/binder_alloc.h index f61a12d5c1e7..ab3b027bcd29 100644 --- a/drivers/android/binder_alloc.h +++ b/drivers/android/binder_alloc.h @@ -78,7 +78,7 @@ struct binder_lru_page { * (invariant after mmap) * @tsk: tid for task that called init for this proc * (invariant after init) - * @vma_vm_mm: copy of vma->vm_mm (invariant after mmap) + * @mm: copy of task->mm (invariant after open) * @buffer: base of per-proc address space mapped via mmap * @buffers: list of all buffers for this proc * @free_buffers: rb tree of buffers available for allocation @@ -101,7 +101,7 @@ struct binder_lru_page { struct binder_alloc { struct mutex mutex; unsigned long vma_addr; - struct mm_struct *vma_vm_mm; + struct mm_struct *mm; void __user *buffer; struct list_head buffers; struct rb_root free_buffers; --=20 2.37.2.789.g6183377224-goog From nobody Mon Apr 6 14:10:06 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62C1CECAAA1 for ; Tue, 6 Sep 2022 14:41:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242168AbiIFOly (ORCPT ); Tue, 6 Sep 2022 10:41:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234075AbiIFOjX (ORCPT ); Tue, 6 Sep 2022 10:39:23 -0400 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE7B29AF86 for ; Tue, 6 Sep 2022 07:01:13 -0700 (PDT) Received: by mail-pg1-x549.google.com with SMTP id 135-20020a63018d000000b00430673f7922so5777828pgb.6 for ; Tue, 06 Sep 2022 07:01:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date; bh=S43B5VbJjHS0PJ6EeGXWAwhqAvbS5qlJaZ4GjrbF1RI=; b=Mh+eOLxHEbPlHpqMHmSaSX+6tf08G5GDTFan3UWIXZI26qQBFhyZgTFmobOIIGfoqC Brwe+9slcD3mlkOADE4mKXhhWLv/sAUIxzWY4dCEBmvOuekgpiashVSXYjdZyJoh0LGO F5slXer4q+y4RuHr4wwIJOIMb3n7+S125xBNkKZIaVgsSd3ozDtFol0COxXrjLdXd0Dm wq4GvFPK6O4mHYxv8vkSBggFyL2K9XQtJxbK0sTVm5NbUkkjUfGIwRRtG2OEa0ZNrpJy zb/bsruHsaWfa8qHHjs7lObbF68svhTIJjlrfDH5+Mi86JJYY/ch0ji5CDDbHqF9GGm3 udeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date; bh=S43B5VbJjHS0PJ6EeGXWAwhqAvbS5qlJaZ4GjrbF1RI=; b=BjcaRnrpDjDCjz0iz576IMjCLO8k1pQ5gj5D/j/H2CXBix0t/2ObTS5oWqCR4hBp36 T/irWi0FFt4od8BwyO6lXL5dnyonIXS+DVrwLPdJ5wGxIuszCir6L9z7xJphyc0r0Jti zDjUySGweIl0vm4c2z/dZKaj+FHW51PQead9TA1fD1ex/zCh8oFpGPpx7FKMlJWkXu4i xdgDIg0ok3RwK2lajrbp5Myh/cVtqk4pXzmrKY5Qe+zdQScWZNO1ugcq4L51OAZAvB6c ALuqClj3HkBY0/efsFj/wikXRroRTBRMvgIsFlH3/IMTwURDZxv6uuzTE8NOemjpY+v9 e8Sw== X-Gm-Message-State: ACgBeo3iMCpckp/ctGJOKs9i1TUeaX4nX+lwijhphvR777DjqHy/WBnl 2D9JqkAYs7+mlt9J613D5x4umeCuju/5pw== X-Google-Smtp-Source: AA6agR5vfEfLq3l6S4beFN19ULDG8aLCXXCylZ07vBlYwDu8QgN41nH8864JlMEgvO+w2gygCBWbiz6wVNawew== X-Received: from xllamas.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5070]) (user=cmllamas job=sendgmr) by 2002:a17:90b:10a:b0:200:2849:235f with SMTP id p10-20020a17090b010a00b002002849235fmr1125261pjz.1.1662472801461; Tue, 06 Sep 2022 07:00:01 -0700 (PDT) Date: Tue, 6 Sep 2022 13:59:46 +0000 In-Reply-To: <20220906135948.3048225-1-cmllamas@google.com> Mime-Version: 1.0 References: <20220906135948.3048225-1-cmllamas@google.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220906135948.3048225-3-cmllamas@google.com> Subject: [PATCH RESEND 2/3] binder: remove binder_alloc_set_vma() From: Carlos Llamas To: Greg Kroah-Hartman , "=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=" , Todd Kjos , Martijn Coenen , Joel Fernandes , Christian Brauner , Carlos Llamas , Suren Baghdasaryan Cc: kernel-team@android.com, "Liam R . Howlett" , linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The mmap_locked asserts here are not needed since this is only called back from the mmap stack in ->mmap() and ->close() which always acquire the lock first. Remove these asserts along with binder_alloc_set_vma() altogether since it's trivial enough to be consumed by callers. Cc: Liam R. Howlett Signed-off-by: Carlos Llamas --- drivers/android/binder_alloc.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c index 749a4cd30a83..1c39cfce32fa 100644 --- a/drivers/android/binder_alloc.c +++ b/drivers/android/binder_alloc.c @@ -309,27 +309,6 @@ static int binder_update_page_range(struct binder_allo= c *alloc, int allocate, return vma ? -ENOMEM : -ESRCH; } =20 - -static inline void binder_alloc_set_vma(struct binder_alloc *alloc, - struct vm_area_struct *vma) -{ - unsigned long vm_start =3D 0; - - /* - * Allow clearing the vma with holding just the read lock to allow - * munmapping downgrade of the write lock before freeing and closing the - * file using binder_alloc_vma_close(). - */ - if (vma) { - vm_start =3D vma->vm_start; - mmap_assert_write_locked(alloc->mm); - } else { - mmap_assert_locked(alloc->mm); - } - - alloc->vma_addr =3D vm_start; -} - static inline struct vm_area_struct *binder_alloc_get_vma( struct binder_alloc *alloc) { @@ -793,7 +772,7 @@ int binder_alloc_mmap_handler(struct binder_alloc *allo= c, buffer->free =3D 1; binder_insert_free_buffer(alloc, buffer); alloc->free_async_space =3D alloc->buffer_size / 2; - binder_alloc_set_vma(alloc, vma); + alloc->vma_addr =3D vma->vm_start; =20 return 0; =20 @@ -983,7 +962,7 @@ int binder_alloc_get_allocated_count(struct binder_allo= c *alloc) */ void binder_alloc_vma_close(struct binder_alloc *alloc) { - binder_alloc_set_vma(alloc, NULL); + alloc->vma_addr =3D 0; } =20 /** --=20 2.37.2.789.g6183377224-goog From nobody Mon Apr 6 14:10:06 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EEC60ECAAA1 for ; Tue, 6 Sep 2022 14:41:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242142AbiIFOlo (ORCPT ); Tue, 6 Sep 2022 10:41:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242387AbiIFOjQ (ORCPT ); Tue, 6 Sep 2022 10:39:16 -0400 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F16B19AFA2 for ; Tue, 6 Sep 2022 07:01:15 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id p18-20020a170902e75200b00176c0e055c9so2287637plf.17 for ; Tue, 06 Sep 2022 07:01:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date; bh=+Q6B/cTB5oT3fqaZDpIDHs2zE/85n+XEC/rzCUUmUUs=; b=fk3U/t/BSZPHw9Bf1Iqbtg/jRCq0HsROm/s9tfLAq/MH4ARIlquxqeYveq/8Imsj0C s7a9BkcLOkuascsOwBzQ2uL6ZJJ+or3McsNseAy6TDk5QhFiZtD8jrnZfUdhYArRglIt 84Qy7/TpEcWoKipEsAeKVyTr+smrSgDovkV2e1mZc5IoCnsEbMwqIKRAUOjDRmCU/JxP IMfDX8IAgctbiS6sDOpD2GtS/EytuF6VbHaruYPZT/uUX8sKXgbpFGAG3Rtc+S/2nVsE YFPunQ+R61mHewEU6HMHYDzOaqHKIWLkn//+UDhsYk6JA7u9Ax/4PuJ4BTwKnzFhq6fE kuUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date; bh=+Q6B/cTB5oT3fqaZDpIDHs2zE/85n+XEC/rzCUUmUUs=; b=SFvw2uBZPAq4siq1REf0RcJ4mTz/s7yltKHq76RvAnIiW8GyGx1Oxu7Fr1595VbsTW +2EszAUcX3rZY+XY8zIj/JAB1YF5ry0HIU51P0gFxwL8AR0Y8MrrgdHAf3b6SLzACQVH pzGeIXvq/me6yIueIXkCIQPv+xKPqQMK7RGrRMzI/n/GH1jFU55dDQTFVz/OBa9AHswB 54xuH/ssjoMYddvz4kcaFISYHJ+z6QfOCY0Oh0Kdr6J6z5sJcqjckHez2lh/Y5dVgBYL 51b7POqDEv59SKrROdlDvRgPJUO/O1Q1gIOIuJzEsSAdcuIgeznDdMaw23cDZEN40k8m TDUQ== X-Gm-Message-State: ACgBeo2AIP7f8vHw8clX1PJJJFMebrBMGs2xdDPSXK5pC3RNehF+ih/4 QV39QvnnPTH94yKYBJUj4q8RpXeki/KJOA== X-Google-Smtp-Source: AA6agR4MuU2P2JcPxrTr4nNG0hdwb++wxvhKgALyWAzsPADtaWvGC72IlSRZ3HervIO7xpA5+te9svzAmKEqKQ== X-Received: from xllamas.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5070]) (user=cmllamas job=sendgmr) by 2002:a05:6a00:10cf:b0:528:48c3:79e0 with SMTP id d15-20020a056a0010cf00b0052848c379e0mr54787114pfu.18.1662472803931; Tue, 06 Sep 2022 07:00:03 -0700 (PDT) Date: Tue, 6 Sep 2022 13:59:47 +0000 In-Reply-To: <20220906135948.3048225-1-cmllamas@google.com> Mime-Version: 1.0 References: <20220906135948.3048225-1-cmllamas@google.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220906135948.3048225-4-cmllamas@google.com> Subject: [PATCH RESEND 3/3] binder: fix binder_alloc kernel-doc warnings From: Carlos Llamas To: Greg Kroah-Hartman , "=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=" , Todd Kjos , Martijn Coenen , Joel Fernandes , Christian Brauner , Carlos Llamas , Suren Baghdasaryan Cc: kernel-team@android.com, Todd Kjos , linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Update the kernel-doc section of struct binder_alloc to fix the following warnings reported by ./scripts/kernel-doc: warning: Function parameter or member 'mutex' not described in 'binder_al= loc' warning: Function parameter or member 'vma_addr' not described in 'binder= _alloc' No functional changes in this patch. Signed-off-by: Carlos Llamas Acked-by: Todd Kjos Reviewed-by: Christian Brauner (Microsoft) --- drivers/android/binder_alloc.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/android/binder_alloc.h b/drivers/android/binder_alloc.h index ab3b027bcd29..0f811ac4bcff 100644 --- a/drivers/android/binder_alloc.h +++ b/drivers/android/binder_alloc.h @@ -74,10 +74,9 @@ struct binder_lru_page { =20 /** * struct binder_alloc - per-binder proc state for binder allocator - * @vma: vm_area_struct passed to mmap_handler + * @mutex: protects binder_alloc fields + * @vma_addr: vm_area_struct->vm_start passed to mmap_handler * (invariant after mmap) - * @tsk: tid for task that called init for this proc - * (invariant after init) * @mm: copy of task->mm (invariant after open) * @buffer: base of per-proc address space mapped via mmap * @buffers: list of all buffers for this proc --=20 2.37.2.789.g6183377224-goog