Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ade3aff25fb2dce76e2a9b53e1334bd0a174f739

Authored by Andrew Morton
Committed by Linus Torvalds
1 parent 0b44f7a5b5
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

slub: fix handling of oversized slabs 

I'm getting zillions of undefined references to __kmalloc_size_too_large on
alpha.  For some reason alpha is building out-of-line copies of kmalloc_slab()
into lots of compilation units.

It turns out that gcc just isn't smart enough to work out that
__builtin_contant_p(size)==true implies that __builtin_contant_p(index)==true.

So let's give it a bit of help.

Cc: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 6 additions and 1 deletions Side-by-side Diff

include/linux/slub_def.h
Diff comments   View file @ ade3aff
... ... @@ -145,7 +145,12 @@
145 145 if (index == 0)
146 146 return NULL;
147 147  
148   - if (index < 0) {
  148 + /*
  149 + * This function only gets expanded if __builtin_constant_p(size), so
  150 + * testing it here shouldn't be needed. But some versions of gcc need
  151 + * help.
  152 + */
  153 + if (__builtin_constant_p(size) && index < 0) {
149 154 /*
150 155 * Generate a link failure. Would be great if we could
151 156 * do something to stop the compile here.