Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758773AbZCPRzM (ORCPT ); Mon, 16 Mar 2009 13:55:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757891AbZCPRve (ORCPT ); Mon, 16 Mar 2009 13:51:34 -0400 Received: from gir.skynet.ie ([193.1.99.77]:51192 "EHLO gir.skynet.ie" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757363AbZCPRvb (ORCPT ); Mon, 16 Mar 2009 13:51:31 -0400 From: Mel Gorman To: Mel Gorman , Linux Memory Management List Cc: Pekka Enberg , Rik van Riel , KOSAKI Motohiro , Christoph Lameter , Johannes Weiner , Nick Piggin , Linux Kernel Mailing List , Lin Ming , Zhang Yanmin , Peter Zijlstra Subject: [PATCH 12/27] Remove a branch by assuming __GFP_HIGH == ALLOC_HIGH Date: Mon, 16 Mar 2009 17:53:26 +0000 Message-Id: <1237226020-14057-13-git-send-email-mel@csn.ul.ie> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1237226020-14057-1-git-send-email-mel@csn.ul.ie> References: <1237226020-14057-1-git-send-email-mel@csn.ul.ie> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1072 Lines: 32 Allocations that specify __GFP_HIGH get the ALLOC_HIGH flag. If these flags are equal to each other, we can eliminate a branch. [akpm@linux-foundation.org: Suggested the hack] Signed-off-by: Mel Gorman --- mm/page_alloc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index ad26052..1e8b4b6 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1640,8 +1640,8 @@ gfp_to_alloc_flags(gfp_t gfp_mask) * policy or is asking for __GFP_HIGH memory. GFP_ATOMIC requests will * set both ALLOC_HARDER (!wait) and ALLOC_HIGH (__GFP_HIGH). */ - if (gfp_mask & __GFP_HIGH) - alloc_flags |= ALLOC_HIGH; + VM_BUG_ON(__GFP_HIGH != ALLOC_HIGH); + alloc_flags |= (gfp_mask & __GFP_HIGH); if (!wait) { alloc_flags |= ALLOC_HARDER; -- 1.5.6.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/