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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15FDAC433EF for ; Tue, 19 Oct 2021 14:30:31 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A2CD960FC1 for ; Tue, 19 Oct 2021 14:30:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A2CD960FC1 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 4015A6B006C; Tue, 19 Oct 2021 10:30:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 388E66B0072; Tue, 19 Oct 2021 10:30:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 22A14900002; Tue, 19 Oct 2021 10:30:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0243.hostedemail.com [216.40.44.243]) by kanga.kvack.org (Postfix) with ESMTP id 13C196B006C for ; Tue, 19 Oct 2021 10:30:30 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id C2D0F183AB0BD for ; Tue, 19 Oct 2021 14:30:29 +0000 (UTC) X-FDA: 78713422578.16.ED3BEFB Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf22.hostedemail.com (Postfix) with ESMTP id 5D3ED1908 for ; Tue, 19 Oct 2021 14:30:28 +0000 (UTC) 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=be9ub126mtaRy3YmFJcE5Dh1u2HQa5PSWqhjnH8ilvU=; b=mHUDr35gaQbBtoLk4zJs1JSPWh GEJ04rETgQdvk0SbzXsQWl7+lDHUjk3sDhdPXerBQ7d+1bkhKU6jaoMixrvDlCo2u+dtWOagBC9TA qDrqEb99X4Vo4PgIwKJ3OWQTy9h86qk0iRNe43puswSBcuhg/lgQpO81GvwaZn8siZqqyAgUGU4Dq sNGyqHyq8+5BmvvSDOBDPX0FFFMoiNS2w2IJDpjuYIa2A7DnbmcZsoBd6qr25IqoPE0iRP5EDD0xO l1xiGRAyPNaraUadHAYJVheisbV7MmK1JH3iWOEpzVEC/3xlvS3R1jNbQojr9Ijr16OZWG+dm5XeL WTgJ+29w==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcq6U-00Bn5H-H6; Tue, 19 Oct 2021 14:28:54 +0000 From: "Matthew Wilcox (Oracle)" To: Yafang Shao Cc: "Matthew Wilcox (Oracle)" , Sergey Senozhatsky , Petr Mladek , linux-mm@kvack.org, Vlastimil Babka , Rasmus Villemoes Subject: [PATCH v2 2/5] test_printf: Remove separate page_flags variable Date: Tue, 19 Oct 2021 15:26:18 +0100 Message-Id: <20211019142621.2810043-3-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211019142621.2810043-1-willy@infradead.org> References: <20211019142621.2810043-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 5D3ED1908 X-Stat-Signature: nk6wr8537oww1a9bm54b6ob96prkusgn Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=mHUDr35g; dmarc=none; spf=none (imf22.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-HE-Tag: 1634653828-761180 Content-Transfer-Encoding: quoted-printable 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: Keep flags intact so that we also test what happens when unknown flags are passed to %pGp. Signed-off-by: Matthew Wilcox (Oracle) --- lib/test_printf.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/test_printf.c b/lib/test_printf.c index a52c1c3a55ba..4531063afd45 100644 --- a/lib/test_printf.c +++ b/lib/test_printf.c @@ -605,17 +605,15 @@ static const struct page_flags_test pft[] =3D { =20 static void __init page_flags_test(int section, int node, int zone, int last_cpupid, - int kasan_tag, int flags, const char *name, char *cmp_buf) + int kasan_tag, unsigned long flags, const char *name, + char *cmp_buf) { unsigned long values[] =3D {section, node, zone, last_cpupid, kasan_tag= }; - unsigned long page_flags =3D 0; unsigned long size =3D 0; bool append =3D false; int i; =20 - flags &=3D PAGEFLAGS_MASK; - if (flags) { - page_flags |=3D flags; + if (flags & PAGEFLAGS_MASK) { snprintf(cmp_buf + size, BUF_SIZE - size, "%s", name); size =3D strlen(cmp_buf); #if SECTIONS_WIDTH || NODES_WIDTH || ZONES_WIDTH || \ @@ -635,7 +633,7 @@ page_flags_test(int section, int node, int zone, int = last_cpupid, size =3D strlen(cmp_buf); } =20 - page_flags |=3D (values[i] & pft[i].mask) << pft[i].shift; + flags |=3D (values[i] & pft[i].mask) << pft[i].shift; snprintf(cmp_buf + size, BUF_SIZE - size, "%s=3D", pft[i].name); size =3D strlen(cmp_buf); snprintf(cmp_buf + size, BUF_SIZE - size, pft[i].fmt, @@ -644,7 +642,7 @@ page_flags_test(int section, int node, int zone, int = last_cpupid, append =3D true; } =20 - test(cmp_buf, "%pGp", &page_flags); + test(cmp_buf, "%pGp", &flags); } =20 static void __init --=20 2.32.0