2015-06-04-16-23 merged
Andrea Arcangeli (1):
userfaultfd: uAPI: add missing include/types.h
Andrew Morton (2):
mm-do-not-ignore-mapping_gfp_mask-in-page-cache-allocation-paths-checkpatch-fixes
oom-split-out-forced-oom-killer-checkpatch-fixes
Catalin Marinas (1):
mm: kmemleak: fix crashing during kmemleak disabling
Dan Streetman (3):
frontswap: allow multiple backends
zpool: change pr_info to pr_debug
zpool: remove zpool_evict()
Joe Perches (1):
checkpatch: fix "GLOBAL_INITIALISERS" test
Johannes Weiner (1):
mm: memcontrol: fix false-positive VM_BUG_ON() on -rt
Michal Hocko (3):
oom: always panic on OOM when panic_on_oom is configured
mm: do not ignore mapping_gfp_mask in page cache allocation paths
oom: split out forced OOM killer
Mike Kravetz (1):
mm/hugetlb: handle races in alloc_huge_page and hugetlb_reserve_pages
Tejun Heo (2):
memcg: remove unused mem_cgroup->oom_wakeups
memcg: convert mem_cgroup->under_oom from atomic_t to int
Tony Luck (3):
mm/memblock: add extra "flags" to memblock to allow selection of memory based on attribute
mm/memblock: allocate boot time data structures from mirrored memory
x86, mirror: x86 enabling - find mirrored memory ranges
Vlastimil Babka (1):
page-flags-define-behavior-of-lru-related-flags-on-compound-pages-fix-fix
Weijie Yang (1):
zram: clear disk io accounting when reset zram device
zpool: remove zpool_evict()
Remove zpool_evict() helper function. As zbud is currently the only zpool
implementation that supports eviction, add zpool and zpool_ops references
to struct zbud_pool and directly call zpool_ops->evict(zpool, handle) on
eviction.
Currently zpool provides the zpool_evict helper which locks the zpool list
lock and searches through all pools to find the specific one matching the
caller, and call the corresponding zpool_ops->evict function. However,
this is unnecessary, as the zbud pool can simply keep a reference to the
zpool that created it, as well as the zpool_ops, and directly call the
zpool_ops->evict function, when it needs to evict a page. This avoids a
spinlock and list search in zpool for each eviction.
Signed-off-by: Dan Streetman <ddstreet@ieee.org>
Cc: Seth Jennings <sjennings@variantweb.net>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
4 files changed
