From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764569AbXGWKDw (ORCPT ); Mon, 23 Jul 2007 06:03:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752414AbXGWKDp (ORCPT ); Mon, 23 Jul 2007 06:03:45 -0400 Received: from viefep18-int.chello.at ([213.46.255.22]:57212 "EHLO viefep19-int.chello.at" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752318AbXGWKDo (ORCPT ); Mon, 23 Jul 2007 06:03:44 -0400 Subject: [PATCH] add __GFP_ZERP to GFP_LEVEL_MASK From: Peter Zijlstra To: Andrew Morton , Linus Torvalds , linux-kernel Cc: Christoph Lameter , Daniel Phillips , linux-mm Content-Type: text/plain Date: Mon, 23 Jul 2007 12:03:40 +0200 Message-Id: <1185185020.8197.11.camel@twins> Mime-Version: 1.0 X-Mailer: Evolution 2.10.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Daniel recently spotted that __GFP_ZERO is not (and has never been) part of GFP_LEVEL_MASK. I could not find a reason for this in the original patch: 3977971c7f09ce08ed1b8d7a67b2098eb732e4cd in the -bk tree. This of course is in stark contradiction with the comment accompanying GFP_LEVEL_MASK. Signed-off-by: Peter Zijlstra --- include/linux/gfp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6-2/include/linux/gfp.h =================================================================== --- linux-2.6-2.orig/include/linux/gfp.h +++ linux-2.6-2/include/linux/gfp.h @@ -56,7 +56,7 @@ struct vm_area_struct; /* if you forget to add the bitmask here kernel will crash, period */ #define GFP_LEVEL_MASK (__GFP_WAIT|__GFP_HIGH|__GFP_IO|__GFP_FS| \ __GFP_COLD|__GFP_NOWARN|__GFP_REPEAT| \ - __GFP_NOFAIL|__GFP_NORETRY|__GFP_COMP| \ + __GFP_NOFAIL|__GFP_NORETRY|__GFP_COMP|__GFP_ZERO \ __GFP_NOMEMALLOC|__GFP_HARDWALL|__GFP_THISNODE| \ __GFP_MOVABLE)