From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756634AbbJ2C1x (ORCPT ); Wed, 28 Oct 2015 22:27:53 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:33570 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756619AbbJ2C1u (ORCPT ); Wed, 28 Oct 2015 22:27:50 -0400 Date: Thu, 29 Oct 2015 07:57:44 +0530 From: Viresh Kumar To: trivial@kernel.org Cc: linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org Subject: Re: [PATCH V1 resend] err.h: add (missing) unlikely() to IS_ERR_OR_NULL() Message-ID: <20151029022744.GL3716@ubuntu> References: <4fbcd4f79be9928a093e2a7ac3609beabdf7a8ce.1444724645.git.viresh.kumar@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4fbcd4f79be9928a093e2a7ac3609beabdf7a8ce.1444724645.git.viresh.kumar@linaro.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 13-10-15, 13:57, Viresh Kumar wrote: > IS_ERR_VALUE() already contains it and so we need to add this only to > the !ptr check. That will allow users of IS_ERR_OR_NULL(), to not add > this compiler flag. > > Signed-off-by: Viresh Kumar > --- > @Jiri: You have applied all other patches, but this one. Can you please > apply this one as well, as all others were applied based on the > assumption that this one is applied. :) > > include/linux/err.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/linux/err.h b/include/linux/err.h > index a729120644d5..56762ab41713 100644 > --- a/include/linux/err.h > +++ b/include/linux/err.h > @@ -37,7 +37,7 @@ static inline bool __must_check IS_ERR(__force const void *ptr) > > static inline bool __must_check IS_ERR_OR_NULL(__force const void *ptr) > { > - return !ptr || IS_ERR_VALUE((unsigned long)ptr); > + return unlikely(!ptr) || IS_ERR_VALUE((unsigned long)ptr); > } Ping !! -- viresh