The patch titled i386: account for module percpu space separately from kernel percpu has been added to the -mm tree. Its filename is i386-account-for-module-percpu-space-separately-from-kernel.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: i386: account for module percpu space separately from kernel percpu From: Jeremy Fitzhardinge <jeremy@xxxxxxxx> Rather than using a single constant PERCPU_ENOUGH_ROOM, compute it as the sum of kernel_percpu + PERCPU_MODULE_RESERVE. This is taken directly from the x86_64 tree. Signed-off-by: Jeremy Fitzhardinge <jeremy@xxxxxxxxxxxxx> Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx> Cc: Eric W. Biederman <ebiederm@xxxxxxxxxxxx> Cc: Andi Kleen <ak@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-i386/percpu.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff -puN include/asm-i386/percpu.h~i386-account-for-module-percpu-space-separately-from-kernel include/asm-i386/percpu.h --- a/include/asm-i386/percpu.h~i386-account-for-module-percpu-space-separately-from-kernel +++ a/include/asm-i386/percpu.h @@ -5,6 +5,16 @@ #include <asm-generic/percpu.h> #else +#ifdef CONFIG_MODULES +# define PERCPU_MODULE_RESERVE 8192 +#else +# define PERCPU_MODULE_RESERVE 0 +#endif + +#define PERCPU_ENOUGH_ROOM \ + (ALIGN(__per_cpu_end - __per_cpu_start, SMP_CACHE_BYTES) + \ + PERCPU_MODULE_RESERVE) + /* * PER_CPU finds an address of a per-cpu variable. * _ Patches currently in -mm which might be from jeremy@xxxxxxxx are i386-simplify-smp_call_function-by-using-common-implementation.patch i386-account-for-module-percpu-space-separately-from-kernel.patch fixes-and-cleanups-for-earlyprintk-aka-boot-console.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