From patchwork Mon Dec 6 16:43:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 74394 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 DFC84B70E3 for ; Tue, 7 Dec 2010 03:44:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752942Ab0LFQnz (ORCPT ); Mon, 6 Dec 2010 11:43:55 -0500 Received: from vpn.id2.novell.com ([195.33.99.129]:48409 "EHLO vpn.id2.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752705Ab0LFQny convert rfc822-to-8bit (ORCPT ); Mon, 6 Dec 2010 11:43:54 -0500 Received: from EMEA1-MTA by vpn.id2.novell.com with Novell_GroupWise; Mon, 06 Dec 2010 17:14:15 +0000 Message-Id: <4CFD20D60200007800026287@vpn.id2.novell.com> X-Mailer: Novell GroupWise Internet Agent 8.0.1 Date: Mon, 06 Dec 2010 16:43:50 +0000 From: "Jan Beulich" To: Cc: Subject: [PATCH] use total_highpages when calculating lowmem-only allocation sizes (sctp) 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/sctp/protocol.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 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/sctp/protocol.c +++ 2.6.37-rc4-use-totalhigh_pages/net/sctp/protocol.c @@ -1190,10 +1190,10 @@ SCTP_STATIC __init int sctp_init(void) /* Size and allocate the association hash table. * The methodology is similar to that of the tcp hash tables. */ - if (totalram_pages >= (128 * 1024)) - goal = totalram_pages >> (22 - PAGE_SHIFT); + if (nr_pages >= (128 * 1024)) + goal = nr_pages >> (22 - PAGE_SHIFT); else - goal = totalram_pages >> (24 - PAGE_SHIFT); + goal = nr_pages >> (24 - PAGE_SHIFT); for (order = 0; (1UL << order) < goal; order++) ;