From 60a4fa2b5765e7100a062fbc3c91a5bb611eadc9 Mon Sep 17 00:00:00 2001 From: Johannes Weiner Date: Tue, 29 May 2012 15:06:36 -0700 Subject: [PATCH] --- yaml --- r: 308863 b: refs/heads/master c: e9079911e6c8fb7882de142de76f3ee49b54e000 h: refs/heads/master i: 308861: 929146f642fba6e829807509c0f27c075295b65a 308859: acacd1623373a44164d3dcabf19e430e1f75f4bf 308855: 6f741eac7897dc29ff260b3abf1899bd474e8feb 308847: 822ab45ccaece55c127b5b3fc9a212de157c0a4a 308831: 30911fa6897d65a6ead1a9bf075a5ec31fbcb624 308799: b260600ac51792ea8c7a1225ff0099d3b3c9a76b 308735: 3a272cbf4d8804389c99dfc8f36c7b47b68a3c0d v: v3 --- [refs] | 2 +- trunk/mm/bootmem.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 2f92c45c2ebd..b0f4877e3a34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba539868331874da02017e8dda8ed5b86af6d21a +refs/heads/master: e9079911e6c8fb7882de142de76f3ee49b54e000 diff --git a/trunk/mm/bootmem.c b/trunk/mm/bootmem.c index d9185c30f3cc..9d0f26664b3b 100644 --- a/trunk/mm/bootmem.c +++ b/trunk/mm/bootmem.c @@ -698,18 +698,19 @@ void * __init __alloc_bootmem(unsigned long size, unsigned long align, return ___alloc_bootmem(size, align, goal, limit); } -static void * __init ___alloc_bootmem_node_nopanic(bootmem_data_t *bdata, +static void * __init ___alloc_bootmem_node_nopanic(pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal, unsigned long limit) { void *ptr; again: - ptr = alloc_arch_preferred_bootmem(bdata, size, align, goal, limit); + ptr = alloc_arch_preferred_bootmem(pgdat->bdata, size, + align, goal, limit); if (ptr) return ptr; - ptr = alloc_bootmem_bdata(bdata, size, align, goal, limit); + ptr = alloc_bootmem_bdata(pgdat->bdata, size, align, goal, limit); if (ptr) return ptr; @@ -731,17 +732,16 @@ void * __init __alloc_bootmem_node_nopanic(pg_data_t *pgdat, unsigned long size, if (WARN_ON_ONCE(slab_is_available())) return kzalloc_node(size, GFP_NOWAIT, pgdat->node_id); - return ___alloc_bootmem_node_nopanic(pgdat->bdata, size, - align, goal, 0); + return ___alloc_bootmem_node_nopanic(pgdat, size, align, goal, 0); } -void * __init ___alloc_bootmem_node(bootmem_data_t *bdata, unsigned long size, +void * __init ___alloc_bootmem_node(pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal, unsigned long limit) { void *ptr; - ptr = ___alloc_bootmem_node_nopanic(bdata, size, align, goal, 0); + ptr = ___alloc_bootmem_node_nopanic(pgdat, size, align, goal, 0); if (ptr) return ptr; @@ -771,7 +771,7 @@ void * __init __alloc_bootmem_node(pg_data_t *pgdat, unsigned long size, if (WARN_ON_ONCE(slab_is_available())) return kzalloc_node(size, GFP_NOWAIT, pgdat->node_id); - return ___alloc_bootmem_node(pgdat->bdata, size, align, goal, 0); + return ___alloc_bootmem_node(pgdat, size, align, goal, 0); } void * __init __alloc_bootmem_node_high(pg_data_t *pgdat, unsigned long size, @@ -869,6 +869,6 @@ void * __init __alloc_bootmem_low_node(pg_data_t *pgdat, unsigned long size, if (WARN_ON_ONCE(slab_is_available())) return kzalloc_node(size, GFP_NOWAIT, pgdat->node_id); - return ___alloc_bootmem_node(pgdat->bdata, size, align, - goal, ARCH_LOW_ADDRESS_LIMIT); + return ___alloc_bootmem_node(pgdat, size, align, + goal, ARCH_LOW_ADDRESS_LIMIT); }