linux/arch
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
..
alpha dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
arm Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 2010-08-11 09:17:27 -07:00
avr32 dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
blackfin dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
cris dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
frv dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
h8300 Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block 2010-08-10 15:22:42 -07:00
ia64 [IA64] Fix rwsem: RWSEM_WAITING_BIAS must not be unsigned. 2010-08-12 09:14:56 -07:00
m32r Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block 2010-08-10 15:22:42 -07:00
m68k dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
m68knommu time: Kill off CONFIG_GENERIC_TIME 2010-07-27 12:40:54 +02:00
microblaze dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
mips dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
mn10300 MN10300: Don't try and #include <linux/slab.h> in lib/inflate.c from bootloader 2010-08-12 09:51:35 -07:00
parisc parisc: fix wrong page aligned size calculation in ioremapping code 2010-08-12 08:43:29 -07:00
powerpc Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 2010-08-12 09:11:31 -07:00
s390 Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block 2010-08-10 15:22:42 -07:00
score score: fix dereference of NULL pointer in local_flush_tlb_page() 2010-08-12 08:43:29 -07:00
sh Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2010-08-11 09:13:19 -07:00
sparc dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
tile dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
um dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
x86 Merge branch 'stable/xen-swiotlb-0.8.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen 2010-08-12 09:09:41 -07:00
xtensa dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
.gitignore
Kconfig Merge branch 'perf/nmi' into perf/core 2010-08-05 08:45:05 +02:00