From patchwork Mon Dec 6 16:43:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 74391 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DB5D5B6F1E for ; Tue, 7 Dec 2010 03:43:14 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752985Ab0LFQnJ (ORCPT ); Mon, 6 Dec 2010 11:43:09 -0500 Received: from vpn.id2.novell.com ([195.33.99.129]:48369 "EHLO vpn.id2.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752505Ab0LFQnI convert rfc822-to-8bit (ORCPT ); Mon, 6 Dec 2010 11:43:08 -0500 Received: from EMEA1-MTA by vpn.id2.novell.com with Novell_GroupWise; Mon, 06 Dec 2010 17:13:29 +0000 Message-Id: <4CFD20A8020000780002627E@vpn.id2.novell.com> X-Mailer: Novell GroupWise Internet Agent 8.0.1 Date: Mon, 06 Dec 2010 16:43:04 +0000 From: "Jan Beulich" To: Cc: Subject: [PATCH] use total_highpages when calculating lowmem-only allocation sizes (decnet) Mime-Version: 1.0 Content-Disposition: inline Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org For those (large) table allocations that come only from lowmem, the total amount of memory shouldn't really matter. Signed-off-by: Jan Beulich --- net/decnet/dn_route.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- linux-2.6.37-rc4/net/decnet/dn_route.c +++ 2.6.37-rc4-use-totalhigh_pages/net/decnet/dn_route.c @@ -69,6 +69,7 @@ #include #include #include +#include #include #include #include @@ -1762,7 +1763,7 @@ void __init dn_route_init(void) dn_route_timer.expires = jiffies + decnet_dst_gc_interval * HZ; add_timer(&dn_route_timer); - goal = totalram_pages >> (26 - PAGE_SHIFT); + goal = (totalram_pages - totalhigh_pages) >> (26 - PAGE_SHIFT); for(order = 0; (1UL << order) < goal; order++) /* NOTHING */;