From 75f6c7596dbbfda7bb01ca4fd2afbd2adb002ef1 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Thu, 2 Oct 2008 14:50:18 -0700 Subject: [PATCH] --- yaml --- r: 110135 b: refs/heads/master c: 6babc32c41e3642d875372cb6afbd9ade7a9f311 h: refs/heads/master i: 110133: 431314c23b8a7c22be5c689f3290fed02bb6a47c 110131: c911885b8ad82bdb923f540e334f3fca9db496dc 110127: f50a8d008f25a43db853d4cf594343ca41bafdab v: v3 --- [refs] | 2 +- trunk/mm/page_alloc.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index fcf7caed2757..7e32a592110f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b19de6d1cb07c8bcb6778e771f9cfd5bcfdfd3e +refs/heads/master: 6babc32c41e3642d875372cb6afbd9ade7a9f311 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index e293c58bea58..27b8681139fd 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -268,13 +268,14 @@ void prep_compound_page(struct page *page, unsigned long order) { int i; int nr_pages = 1 << order; + struct page *p = page + 1; set_compound_page_dtor(page, free_compound_page); set_compound_order(page, order); __SetPageHead(page); - for (i = 1; i < nr_pages; i++) { - struct page *p = page + i; - + for (i = 1; i < nr_pages; i++, p++) { + if (unlikely((i & (MAX_ORDER_NR_PAGES - 1)) == 0)) + p = pfn_to_page(page_to_pfn(page) + i); __SetPageTail(p); p->first_page = page; } @@ -284,6 +285,7 @@ static void destroy_compound_page(struct page *page, unsigned long order) { int i; int nr_pages = 1 << order; + struct page *p = page + 1; if (unlikely(compound_order(page) != order)) bad_page(page); @@ -291,8 +293,9 @@ static void destroy_compound_page(struct page *page, unsigned long order) if (unlikely(!PageHead(page))) bad_page(page); __ClearPageHead(page); - for (i = 1; i < nr_pages; i++) { - struct page *p = page + i; + for (i = 1; i < nr_pages; i++, p++) { + if (unlikely((i & (MAX_ORDER_NR_PAGES - 1)) == 0)) + p = pfn_to_page(page_to_pfn(page) + i); if (unlikely(!PageTail(p) | (p->first_page != page)))