diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 09:34:07 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 09:34:07 +0100 |
| commit | e9c4ffb11f0b19005b5b9dc8481687a3637e5887 (patch) | |
| tree | 7007f2ff846b9b057c5cd7c25e8b82e49f9b4b63 /mm/page_cgroup.c | |
| parent | 4bcf349a0f90d1e69eb35c6df0fa285c886c1cd6 (diff) | |
| parent | 071a0bc2ceace31266836801510879407a3701fa (diff) | |
Merge branch 'linus' into perfcounters/core
Conflicts:
arch/x86/kernel/acpi/boot.c
Diffstat (limited to 'mm/page_cgroup.c')
| -rw-r--r-- | mm/page_cgroup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c index 7006a11350c8..ceecfbb143fa 100644 --- a/mm/page_cgroup.c +++ b/mm/page_cgroup.c @@ -114,7 +114,8 @@ static int __init_refok init_section_page_cgroup(unsigned long pfn) nid = page_to_nid(pfn_to_page(pfn)); table_size = sizeof(struct page_cgroup) * PAGES_PER_SECTION; if (slab_is_available()) { - base = kmalloc_node(table_size, GFP_KERNEL, nid); + base = kmalloc_node(table_size, + GFP_KERNEL | __GFP_NOWARN, nid); if (!base) base = vmalloc_node(table_size, nid); } else { |