apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing/core

Browse Source
This commit is contained in:
Ingo Molnar
2009-02-03 06:25:38 +01:00
parent b3a8c34886 ecf441b593 b1792e3670
commit dc573f9b20
1490 changed files with 27345 additions and 12339 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/slab_def.h
+2 -8
View File
@@ -62,10 +62,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
i++;
#include <linux/kmalloc_sizes.h>
#undef CACHE
{
extern void __you_cannot_kmalloc_that_much(void);
__you_cannot_kmalloc_that_much();
}
return NULL;
found:
#ifdef CONFIG_ZONE_DMA
if (flags & GFP_DMA)
@@ -120,10 +117,7 @@ static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
i++;
#include <linux/kmalloc_sizes.h>
#undef CACHE
{
extern void __you_cannot_kmalloc_that_much(void);
__you_cannot_kmalloc_that_much();
}
return NULL;
found:
#ifdef CONFIG_ZONE_DMA
if (flags & GFP_DMA)