aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-17 09:41:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-17 09:41:25 -0700
commit4ce4b1b73b4dd37e4a70390976ac0bcf7038d6f9 (patch)
tree2e8de1e183eb5f8c7b55b22d65bc698367e7f8a8 /include/linux
parent9cb0fbf7f8cbbd16218a4fb5983ac55fbc031929 (diff)
parent5caf5c7dc2d303b770e426f7e2238df882f1773b (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: SLUB: Fix early boot GFP_DMA allocations SLUB: Don't print out OOM warning for __GFP_NOFAIL SLUB: fix build when !SLUB_DEBUG SLUB: Out-of-memory diagnostics slab: document kzfree() zeroing behavior slab: fix generic PAGE_POISONING conflict with SLAB_RED_ZONE slob: use PG_slab for identifying SLOB pages
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/page-flags.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index d6792f88a17..e2e5ce54359 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -118,7 +118,6 @@ enum pageflags {
PG_savepinned = PG_dirty,
/* SLOB */
- PG_slob_page = PG_active,
PG_slob_free = PG_private,
/* SLUB */
@@ -201,7 +200,6 @@ PAGEFLAG(SavePinned, savepinned); /* Xen */
PAGEFLAG(Reserved, reserved) __CLEARPAGEFLAG(Reserved, reserved)
PAGEFLAG(SwapBacked, swapbacked) __CLEARPAGEFLAG(SwapBacked, swapbacked)
-__PAGEFLAG(SlobPage, slob_page)
__PAGEFLAG(SlobFree, slob_free)
__PAGEFLAG(SlubFrozen, slub_frozen)