On Sat, Mar 1, 2014 at 5:02 PM, Gideon Israel Dsouza <gidisrael@xxxxxxxxx> wrote: > --- a/mm/sparse.c > +++ b/mm/sparse.c > @@ -9,6 +9,8 @@ > #include <linux/export.h> > #include <linux/spinlock.h> > #include <linux/vmalloc.h> > +#include <linux/compiler.h> Please try to insert new includes in alphabetical order, to avoid merge conflicts. It's no always easy, as lots of include lists are not sorted at all. > + > #include "internal.h" > #include <asm/dma.h> > #include <asm/pgalloc.h> > @@ -459,9 +461,9 @@ static struct page __init *sparse_early_mem_map_alloc(unsigned long pnum) > ms->section_mem_map = 0; > return NULL; > } > -#endif > +endif Woops, this won't compile? Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- 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>