[netfilter-cvslog] r7380 - trunk/patch-o-matic-ng/patchlets/set/linux-2.6/include/linux/netfilter_ipv4

[kadlec at blackhole.kfki.hu]

Author: kadlec at blackhole.kfki.hu
Date: 2008-02-20 22:32:17 +0100 (Wed, 20 Feb 2008)
New Revision: 7380

Modified:
   trunk/patch-o-matic-ng/patchlets/set/linux-2.6/include/linux/netfilter_ipv4/ip_set_malloc.h
Log:
Suppress dump_stack if there is no enough memory: the failure is checked anyway.


Modified: trunk/patch-o-matic-ng/patchlets/set/linux-2.6/include/linux/netfilter_ipv4/ip_set_malloc.h
===================================================================
--- trunk/patch-o-matic-ng/patchlets/set/linux-2.6/include/linux/netfilter_ipv4/ip_set_malloc.h	2008-02-19 23:04:49 UTC (rev 7379)
+++ trunk/patch-o-matic-ng/patchlets/set/linux-2.6/include/linux/netfilter_ipv4/ip_set_malloc.h	2008-02-20 21:32:17 UTC (rev 7380)
@@ -127,7 +127,7 @@
 	if (bytes > max_malloc_size)
 		return vmalloc(bytes);
 	else
-		return kmalloc(bytes, GFP_KERNEL);
+		return kmalloc(bytes, GFP_KERNEL | __GFP_NOWARN);
 }
 
 static inline void ip_set_free(void * data, size_t bytes)