From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0FFEC5479D for ; Wed, 11 Jan 2023 14:29:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C0FF88E0012; Wed, 11 Jan 2023 09:29:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 90208940007; Wed, 11 Jan 2023 09:29:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1D978940007; Wed, 11 Jan 2023 09:29:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 04B4D900009 for ; Wed, 11 Jan 2023 09:29:11 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id CBA1140C4D for ; Wed, 11 Jan 2023 14:29:10 +0000 (UTC) X-FDA: 80342750460.11.7D5BFBB Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf25.hostedemail.com (Postfix) with ESMTP id 2D73EA000D for ; Wed, 11 Jan 2023 14:29:08 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=acFVmWPY; dmarc=none; spf=none (imf25.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673447349; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=tHWFuBexE/gwqgDbwm1Ra1Jg75D0HvKvTbVZv2jbd88=; b=6chhG3c40B2UYW0LiI0zCsK/xoPlJ5V8p+9WdwHtEJTT2LNGGungNfieoQEJXq/WcRkwFK 9/ia1QYkewtOLomY3r87UUBh2kc7FdNlXJcvf0o5AhAHwKWaqmz9MXkurw/uThXVeXnVTu 2V761UUKTkUWSCz/KI6WXKWbf1aaULc= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=acFVmWPY; dmarc=none; spf=none (imf25.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673447349; a=rsa-sha256; cv=none; b=5dmsiUgbc+Eiv/Yg7A+nEeBe/eD7DuRfpmbdJ7U3UFzOEmZUfFt3+iNZ5HLAwY/3rYgmE5 d7bIPyVyZy/7QIc33e5FLPUDnF4cs+WTQwqHNgCOHMXiiKvvKH7z8xKUi0h6q+R30E2Jbv Qg+fk6kuPLWDHVIcNftA9zZ31R6MtcA= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=tHWFuBexE/gwqgDbwm1Ra1Jg75D0HvKvTbVZv2jbd88=; b=acFVmWPYkuLNp2v5Ek7++JHtB0 cmBrvnt6Xb1ZqWH5Jjyve4OHvmg95UBGuX3YGZTO3n96iBdDmscDc5/dYTWG1l1Yh4aBSEHMbwc5I YU+sTXYqDrUBAlBTRXuaJmOMuevNgX0AN+dQZ32v6xsnVy9Uh/D41LLX/AwtbZV14aYSlfyrcV4MR 7nMAOvv8+Ri9oDjA4MDxsg+6KKhmdSch22ndrQ/XZwlvsR6S3yAnbAc6r7o41G2soUxJVlzdgx34l In86icW9SH/EVdbmf+EXLdE+Xg2D53/cqPPb9qA7cpykcMEQiRQgQaXeCY9Q4Nnq2gXSdh7+eyH8q i1vIxkCw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFc6R-004CaW-R2; Wed, 11 Jan 2023 14:29:19 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Hugh Dickins Subject: [PATCH 23/28] doc: Correct struct folio kernel-doc Date: Wed, 11 Jan 2023 14:29:09 +0000 Message-Id: <20230111142915.1001531-24-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230111142915.1001531-1-willy@infradead.org> References: <20230111142915.1001531-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 2D73EA000D X-Stat-Signature: n7qypysak77iq8pew1gtcifjxen83foy X-HE-Tag: 1673447348-907766 X-HE-Meta: U2FsdGVkX1+0hnTseuiamHrRqNj3NiF4SWw3WWx807+jKE2xVSrPRCVvYQ556YHrpqGYAII4rxaQgW9dMZB+9T618Rw+B00Z5/CsOLfzdtNcKd2Mr+ECC8rsFIVU0cyl3z8cCD5ouxzEAMd0UGh6DFxd4RjogdstF1l0dZAYKOXnwex+QXBmo9A8uzbIlm+w06UMuD9FKamxH3kxq+ZB0sEjQxebjOQaoDAVrqIkhoGSRsF3/g/SbHYWeU/5kIOJlyhZp9axmziRzMd+V0jIOWFuRgEyjgpURoMGxNNHOUgvfAZqhklSOtMEHSQcfHEF8SbPplxhA8PMAKqxo/iSBBwWSkoFuwCn/nrPhb2rmI4N7kkf7ig4RoQ1UzjNgTpytufbcAoRICXgLqiZlVKrSJDvMImOthwJZq/aiVPFLRDxaRoaMVAPF+IaP9mzDoze/CjZS+I+yHCp2knQNB+4eoEb/jUwztJPS/UtBKJVUVsyqiCljKPVRHZJGGHMVRRwJu+BCtO+AKia2F8PD77gS9N7vCkAchirhmRCgS3nFap2jOErJidMxcAL+yz+s8F5hbbO1mgtH3xqKmcZv0aefiMILQydO2fIAmle4lBVwJHbEOvmWIPXYTq1qhPEnxZ0jd8fnFlMkIrQFrxt+1U93bRoLzFcBGtVKm+w95jgjvwfTDQwmZHYVldL0BIMXImZxbmaj4zsz4VG/8vOxS8K3Ae4rMO7XwsqEEDS0I8dzfGqddkKTPWyp04ER/Rfb0j7vHLGiSvdTJLNi9PoNRtbfB1PRxJBh/fYVSFj6JOOEfteU0MfN0BeOxtvnqcLsH7cn9RXl+I7mZ0AQRBQQv3k9xvLGeFodYOXTpzqgi7T/Sr06zdfcsMyH2Lkp0zT9mXvCAmiD1lJ7pw= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Insert appropriate public: and private: markers to make the generated kernel-doc look right. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/mm_types.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 61a2e6b32781..4b8aa0f8f9fe 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -292,16 +292,12 @@ static inline struct page *encoded_page_ptr(struct encoded_page *page) * @_refcount: Do not access this member directly. Use folio_ref_count() * to find how many references there are to this folio. * @memcg_data: Memory Control Group data. - * @_flags_1: For large folios, additional page flags. - * @_head_1: Points to the folio. Do not use. * @_folio_dtor: Which destructor to use for this folio. * @_folio_order: Do not use directly, call folio_order(). * @_entire_mapcount: Do not use directly, call folio_entire_mapcount(). * @_nr_pages_mapped: Do not use directly, call folio_mapcount(). * @_pincount: Do not use directly, call folio_maybe_dma_pinned(). * @_folio_nr_pages: Do not use directly, call folio_nr_pages(). - * @_flags_2: For alignment. Do not use. - * @_head_2: Points to the folio. Do not use. * @_hugetlb_subpool: Do not use directly, use accessor in hugetlb.h. * @_hugetlb_cgroup: Do not use directly, use accessor in hugetlb_cgroup.h. * @_hugetlb_cgroup_rsvd: Do not use directly, use accessor in hugetlb_cgroup.h. @@ -348,6 +344,7 @@ struct folio { struct { unsigned long _flags_1; unsigned long _head_1; + /* public: */ unsigned char _folio_dtor; unsigned char _folio_order; atomic_t _entire_mapcount; @@ -356,6 +353,7 @@ struct folio { #ifdef CONFIG_64BIT unsigned int _folio_nr_pages; #endif + /* private: the union with struct page is transitional */ }; struct page __page_1; }; @@ -363,10 +361,12 @@ struct folio { struct { unsigned long _flags_2; unsigned long _head_2; + /* public: */ void *_hugetlb_subpool; void *_hugetlb_cgroup; void *_hugetlb_cgroup_rsvd; void *_hugetlb_hwpoison; + /* private: the union with struct page is transitional */ }; struct page __page_2; }; -- 2.35.1