X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=mm%2Fkmemleak.c;h=b57383c17cf60706f45ae3d20b2295b181ed69a6;hb=2c3ef25c4a60cc18cf3f05a74c78220748f25684;hp=b59f1761d817d631228a18d80c6c4899429f7c50;hpb=9c566611ac5cc7b45af943632f7a9b1b6a642991;p=linux-2.6-microblaze.git

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index b59f1761d817..b57383c17cf6 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -113,7 +113,8 @@
 #define BYTES_PER_POINTER	sizeof(void *)
 
 /* GFP bitmask for kmemleak internal allocations */
-#define gfp_kmemleak_mask(gfp)	(((gfp) & (GFP_KERNEL | GFP_ATOMIC)) | \
+#define gfp_kmemleak_mask(gfp)	(((gfp) & (GFP_KERNEL | GFP_ATOMIC | \
+					   __GFP_NOLOCKDEP)) | \
 				 __GFP_NORETRY | __GFP_NOMEMALLOC | \
 				 __GFP_NOWARN)