From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754918Ab1LMN6s (ORCPT ); Tue, 13 Dec 2011 08:58:48 -0500 Received: from zene.cmpxchg.org ([85.214.230.12]:58145 "EHLO zene.cmpxchg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754890Ab1LMN6n (ORCPT ); Tue, 13 Dec 2011 08:58:43 -0500 From: Johannes Weiner To: Andrew Morton , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [patch 1/4] mm: page_alloc: remove order assumption from __free_pages_bootmem() Date: Tue, 13 Dec 2011 14:58:28 +0100 Message-Id: <1323784711-1937-2-git-send-email-hannes@cmpxchg.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1323784711-1937-1-git-send-email-hannes@cmpxchg.org> References: <1323784711-1937-1-git-send-email-hannes@cmpxchg.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Even though bootmem passes an order with the page to be freed, __free_pages_bootmem() assumes that 1 << order is always BITS_PER_LONG if non-zero. While this happens to be true, it's not really robust. Remove that assumption and use 1 << order instead. Signed-off-by: Johannes Weiner --- mm/page_alloc.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 2b8ba3a..4d5e91c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -703,13 +703,14 @@ void __meminit __free_pages_bootmem(struct page *page, unsigned int order) set_page_refcounted(page); __free_page(page); } else { - int loop; + unsigned int nr_pages = 1 << order; + unsigned int loop; prefetchw(page); - for (loop = 0; loop < BITS_PER_LONG; loop++) { + for (loop = 0; loop < nr_pages; loop++) { struct page *p = &page[loop]; - if (loop + 1 < BITS_PER_LONG) + if (loop + 1 < nr_pages) prefetchw(p + 1); __ClearPageReserved(p); set_page_count(p, 0); -- 1.7.7.3