mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-10-31 18:09:19 +00:00
vmalloc_32 should use GFP_KERNEL
I've noticed lots of failures of vmalloc_32 on machines where it shouldn't have failed unless it was doing an atomic operation. Looking closely, I noticed that: #if defined(CONFIG_64BIT) && defined(CONFIG_ZONE_DMA32) #define GFP_VMALLOC32 GFP_DMA32 #elif defined(CONFIG_64BIT) && defined(CONFIG_ZONE_DMA) #define GFP_VMALLOC32 GFP_DMA #else #define GFP_VMALLOC32 GFP_KERNEL #endif Which seems to be incorrect, it should always -or- in the DMA flags on top of GFP_KERNEL, thus this patch. This fixes frequent errors launchin X with the nouveau DRM for example. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Andi Kleen <ak@suse.de> Cc: Dave Airlie <airlied@linux.ie> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
ea02e3dde3
commit
7ac674f527
1 changed files with 2 additions and 2 deletions
|
@ -583,9 +583,9 @@ void *vmalloc_exec(unsigned long size)
|
|||
}
|
||||
|
||||
#if defined(CONFIG_64BIT) && defined(CONFIG_ZONE_DMA32)
|
||||
#define GFP_VMALLOC32 GFP_DMA32
|
||||
#define GFP_VMALLOC32 GFP_DMA32 | GFP_KERNEL
|
||||
#elif defined(CONFIG_64BIT) && defined(CONFIG_ZONE_DMA)
|
||||
#define GFP_VMALLOC32 GFP_DMA
|
||||
#define GFP_VMALLOC32 GFP_DMA | GFP_KERNEL
|
||||
#else
|
||||
#define GFP_VMALLOC32 GFP_KERNEL
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue