From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751851AbdATKCv (ORCPT ); Fri, 20 Jan 2017 05:02:51 -0500 Received: from mail-pg0-f43.google.com ([74.125.83.43]:35872 "EHLO mail-pg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751598AbdATKCt (ORCPT ); Fri, 20 Jan 2017 05:02:49 -0500 Date: Fri, 20 Jan 2017 02:02:47 -0800 (PST) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: Vlastimil Babka cc: Andrew Morton , Michal Hocko , Johannes Weiner , Mel Gorman , linux-mm@kvack.org, LKML , Rasmus Villemoes Subject: Re: [patch] mm, oom: header nodemask is NULL when cpusets are disabled In-Reply-To: Message-ID: References: <279f10c2-3eaa-c641-094f-3070db67d84f@suse.cz> User-Agent: Alpine 2.10 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 20 Jan 2017, Vlastimil Babka wrote: > Could we simplify both patches with something like this? > Although the sizeof("null") is not the nicest thing, because it relies on knowledge > that pointer() in lib/vsprintf.c uses this string. Maybe Rasmus has some better idea? > > Thanks, > Vlastimil > > diff --git a/include/linux/nodemask.h b/include/linux/nodemask.h > index f746e44d4046..4add88ef63f0 100644 > --- a/include/linux/nodemask.h > +++ b/include/linux/nodemask.h > @@ -103,7 +103,7 @@ extern nodemask_t _unused_nodemask_arg_; > * > * Can be used to provide arguments for '%*pb[l]' when printing a nodemask. > */ > -#define nodemask_pr_args(maskp) MAX_NUMNODES, (maskp)->bits > +#define nodemask_pr_args(maskp) ((maskp) ? MAX_NUMNODES : (int) sizeof("null")), ((maskp) ? (maskp)->bits : NULL) > > /* > * The inline keyword gives the compiler room to decide to inline, or > That's creative. I'm not sure if it's worth it considering nodemask_pr_args() is usually used in a context where we know we have a nodemask :) These would be the only two exceptions.