diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-09-27 01:50:07 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-27 08:26:12 -0700 |
commit | 77f700dab4c05f8ee17584ec869672796d7bcb87 (patch) | |
tree | f51447c092beaa02b91ca2ce0c61ee511e48002f | |
parent | 08e0f6a9705376732fd3bc9bf8ba97a6b5211eb1 (diff) | |
download | op-kernel-dev-77f700dab4c05f8ee17584ec869672796d7bcb87.zip op-kernel-dev-77f700dab4c05f8ee17584ec869672796d7bcb87.tar.gz |
[PATCH] Disable GFP_THISNODE in the non-NUMA case
GFP_THISNODE must be set to 0 in the non numa case otherwise we disable retry
and warnings for failing allocations in the SMP and UP case.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | include/linux/gfp.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 8b34aab..bf2b6bc 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -67,7 +67,12 @@ struct vm_area_struct; #define GFP_HIGHUSER (__GFP_WAIT | __GFP_IO | __GFP_FS | __GFP_HARDWALL | \ __GFP_HIGHMEM) +#ifdef CONFIG_NUMA #define GFP_THISNODE (__GFP_THISNODE | __GFP_NOWARN | __GFP_NORETRY) +#else +#define GFP_THISNODE 0 +#endif + /* Flag - indicates that the buffer will be suitable for DMA. Ignored on some platforms, used as appropriate on others */ |