David Howells 1490cf5f0c MN10300: Don't try and #include <linux/slab.h> in lib/inflate.c from bootloader
Don't try and #include <linux/slab.h> in lib/inflate.c from the bootloader code
as linux/slab.h hauls in function defs that aren't available in the bootloader
code and may also haul in conflicting functions.

To fix this, make the inclusion of linux/slab.h contingent on NO_INFLATE_MALLOC
as are the usages of kmalloc() and kfree().

In MN10300, this causes the following errors:

In file included from include/linux/string.h:21,
                 from include/linux/bitmap.h:8,
                 from include/linux/nodemask.h:93,
                 from include/linux/mmzone.h:16,
                 from include/linux/gfp.h:4,
                 from include/linux/slab.h:12,
                 from arch/mn10300/boot/compressed/../../../../lib/inflate.c:106,
                 from arch/mn10300/boot/compressed/misc.c:170:
/warthog/am33/linux-2.6-mn10300/arch/mn10300/include/asm/string.h:19: error: conflicting types for 'memset'
arch/mn10300/boot/compressed/misc.c:59: error: previous definition of 'memset' was here

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-08-12 09:51:35 -07:00
..
2008-07-24 10:47:33 -07:00
2008-06-06 11:29:10 -07:00
2009-11-03 16:06:53 +01:00
2010-07-11 22:16:32 +02:00
2009-01-01 10:12:19 +10:30
2009-06-18 13:04:05 -07:00
2010-05-25 08:07:06 -07:00
2010-04-06 15:52:11 -07:00
2008-07-26 12:00:07 -07:00
2010-08-09 20:45:05 -07:00
2009-12-14 23:55:33 +01:00
2010-05-21 09:37:29 -07:00
2009-10-01 21:17:49 +02:00
2009-12-15 08:53:33 -08:00
2010-06-16 18:08:13 +02:00
2010-01-11 09:34:05 -08:00
2010-03-06 11:26:35 -08:00
2008-07-26 12:00:10 -07:00
2010-05-19 22:40:47 -04:00