lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] mm: microopt conditions

Browse Source 
Micro optimise some conditionals where we don't need lazy evaluation.

Signed-off-by: Nick Piggin <npiggin@suse.de>
Cc: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Nick Piggin
2006-01-06 00:10:57 -08:00
committed by Linus Torvalds
parent 77a8a78834
commit 92be2e33b1
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mm/page_alloc.c
View File

@@ -336,9 +336,9 @@ static inline void __free_pages_bulk (struct page *page,
static inline int free_pages_check(const char *function, struct page *page) static inline int free_pages_check(const char *function, struct page *page)
{ {
if ( page_mapcount(page) || if (unlikely(page_mapcount(page) |
page->mapping != NULL || (page->mapping != NULL) |
page_count(page) != 0 || (page_count(page) != 0) |
(page->flags & ( (page->flags & (
1 << PG_lru | 1 << PG_lru |
1 << PG_private | 1 << PG_private |
@@ -348,7 +348,7 @@ static inline int free_pages_check(const char *function, struct page *page)
1 << PG_slab | 1 << PG_slab |
1 << PG_swapcache | 1 << PG_swapcache |
1 << PG_writeback | 1 << PG_writeback |
1 << PG_reserved ))) 1 << PG_reserved ))))
bad_page(function, page); bad_page(function, page);
if (PageDirty(page)) if (PageDirty(page))
__ClearPageDirty(page); __ClearPageDirty(page);
@@ -458,9 +458,9 @@ expand(struct zone *zone, struct page *page,
*/ */
static int prep_new_page(struct page *page, int order) static int prep_new_page(struct page *page, int order)
{ {
if ( page_mapcount(page) || if (unlikely(page_mapcount(page) |
page->mapping != NULL || (page->mapping != NULL) |
page_count(page) != 0 || (page_count(page) != 0) |
(page->flags & ( (page->flags & (
1 << PG_lru | 1 << PG_lru |
1 << PG_private | 1 << PG_private |
@@ -471,7 +471,7 @@ static int prep_new_page(struct page *page, int order)
1 << PG_slab | 1 << PG_slab |
1 << PG_swapcache | 1 << PG_swapcache |
1 << PG_writeback | 1 << PG_writeback |
1 << PG_reserved ))) 1 << PG_reserved ))))
bad_page(__FUNCTION__, page); bad_page(__FUNCTION__, page);
/* /*