summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Piggin <npiggin@suse.de>2006-03-22 00:08:01 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-22 07:53:57 -0800
commit5e9dace8d386def04219134d7160e8a778824764 (patch)
treed74ca57577cc4872eb6bcf609e3c7f7d1a39fdf6
parent674539115cc88473f623581e1d53c0e2ecef2179 (diff)
downloadblackbird-op-linux-5e9dace8d386def04219134d7160e8a778824764.tar.gz
blackbird-op-linux-5e9dace8d386def04219134d7160e8a778824764.zip
[PATCH] mm: page_alloc less atomics
More atomic operation removal from page allocator Signed-off-by: Nick Piggin <npiggin@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/linux/page-flags.h4
-rw-r--r--mm/page_alloc.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index da71d63df465..76c7ffdd0424 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -328,8 +328,8 @@ extern void __mod_page_state_offset(unsigned long offset, unsigned long delta);
#define TestClearPageReclaim(page) test_and_clear_bit(PG_reclaim, &(page)->flags)
#define PageCompound(page) test_bit(PG_compound, &(page)->flags)
-#define SetPageCompound(page) set_bit(PG_compound, &(page)->flags)
-#define ClearPageCompound(page) clear_bit(PG_compound, &(page)->flags)
+#define __SetPageCompound(page) __set_bit(PG_compound, &(page)->flags)
+#define __ClearPageCompound(page) __clear_bit(PG_compound, &(page)->flags)
#ifdef CONFIG_SWAP
#define PageSwapCache(page) test_bit(PG_swapcache, &(page)->flags)
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 61775866ea18..102919851353 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -190,7 +190,7 @@ static void prep_compound_page(struct page *page, unsigned long order)
for (i = 0; i < nr_pages; i++) {
struct page *p = page + i;
- SetPageCompound(p);
+ __SetPageCompound(p);
set_page_private(p, (unsigned long)page);
}
}
@@ -209,7 +209,7 @@ static void destroy_compound_page(struct page *page, unsigned long order)
if (unlikely(!PageCompound(p) |
(page_private(p) != (unsigned long)page)))
bad_page(page);
- ClearPageCompound(p);
+ __ClearPageCompound(p);
}
}
OpenPOWER on IntegriCloud