The patch titled mm/bootmem.c: properly __init-annotate helper functions has been removed from the -mm tree. Its filename was mm-bootmemc-properly-__init-annotate-helper-functions.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: mm/bootmem.c: properly __init-annotate helper functions From: "Jan Beulich" <JBeulich@xxxxxxxxxx> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/bootmem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN mm/bootmem.c~mm-bootmemc-properly-__init-annotate-helper-functions mm/bootmem.c --- a/mm/bootmem.c~mm-bootmemc-properly-__init-annotate-helper-functions +++ a/mm/bootmem.c @@ -432,8 +432,8 @@ int __init reserve_bootmem(unsigned long return mark_bootmem(start, end, 1, flags); } -static unsigned long align_idx(struct bootmem_data *bdata, unsigned long idx, - unsigned long step) +static unsigned long __init align_idx(struct bootmem_data *bdata, + unsigned long idx, unsigned long step) { unsigned long base = bdata->node_min_pfn; @@ -445,8 +445,8 @@ static unsigned long align_idx(struct bo return ALIGN(base + idx, step) - base; } -static unsigned long align_off(struct bootmem_data *bdata, unsigned long off, - unsigned long align) +static unsigned long __init align_off(struct bootmem_data *bdata, + unsigned long off, unsigned long align) { unsigned long base = PFN_PHYS(bdata->node_min_pfn); _ Patches currently in -mm which might be from JBeulich@xxxxxxxxxx are origin.patch linux-next.patch mm-vmallocc-dont-use-vmalloc_end.patch fix-section-mismatch-in-early-ehci-dbgp.patch dma-mapping-fix-off-by-one-error-in-dma_capable.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html