Hi Andrew, On Thu, 6 Mar 2014 14:58:26 -0800 Andrew Morton wrote: > > On Thu, 6 Mar 2014 18:08:52 +1100 Stephen Rothwell wrote: > > > After merging the akpm-current tree, today's linux-next build (arm > > multi_v7_defconfig) failed like this: > > > > ... > > > > and on and on ... > > > > Caused by commit 0d9ad4220e6d ("mm: per-thread vma caching") which adds > > the include of linux/vmacache.h (which includes linux/mm.h) into > > linux/sched.h ... There is a reason that we did not include linux/mm.h > > into sched.h. > > Yeah. > > > --- /dev/null > > +++ b/include/linux/vmacachedefs.h > > @@ -0,0 +1,9 @@ > > + > > +#ifndef __LINUX_VMACACHEDEFS_H > > +#define __LINUX_VMACACHEDEFS_H > > + > > +#define VMACACHE_BITS 2 > > +#define VMACACHE_SIZE (1U << VMACACHE_BITS) > > +#define VMACACHE_MASK (VMACACHE_SIZE - 1) > > + > > +#endif /* __LINUX_VMACACHEDEFS_H */ > > I just did pretty much the same thing: > > > From: Andrew Morton > Subject: mm-per-thread-vma-caching-fix-3 I will replace my patch with this today. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au