Since your patch set is the _ONLY_ thing that introduces #ifdef's inside functions within this file, I would think you would be better off making get_allocated_memblock_reserved_regions_info() and get_allocated_memblock_memory_regions_info be static inline functions when #ifdef CONFIG_ARCH_DISCARD_MEMBLOCK. That said, I don't have a fundamental objection to #ifdef's inside functions so... Acked-by: Robin Holt <robinmholt@xxxxxxxxx> On Thu, Jan 16, 2014 at 9:49 AM, Philipp Hachtmann <phacht@xxxxxxxxxxxxxxxxxx> wrote: > Hi Robin, > >> Maybe you are working off a different repo than >> Linus' latest? Your line 116 is my 114. Maybe the message needs to >> be a bit more descriptive > > Ah, yes. This fits Andrew's linux-next. > > Regards > > Philipp > -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>