mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-26 06:33:19 -04:00
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
This commit is contained in:
commit
4ce4b1b73b
5 changed files with 98 additions and 28 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue