From f8939cf603d68e9a23e623edf5ede20758051884 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Mon, 8 Oct 2012 16:33:52 -0700 Subject: [PATCH] --- yaml --- r: 332471 b: refs/heads/master c: 3e648ebe076390018c317881d7d926f24d7bac6b h: refs/heads/master i: 332469: 04e8cff3809b99417df8768083b8d3cb8fbe4f87 332467: b038238076c4b775f7b194aa1cd0ea91ab076432 332463: f021cc1e94c74ae8b0d02b319640b106b9b911f9 v: v3 --- [refs] | 2 +- trunk/include/linux/gfp.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1dd6fdf32d7a..be91eb9772a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: beb51eaa88238daba698ad837222ad277d440b6d +refs/heads/master: 3e648ebe076390018c317881d7d926f24d7bac6b diff --git a/trunk/include/linux/gfp.h b/trunk/include/linux/gfp.h index f9bc873ce7d6..02c1c9710be0 100644 --- a/trunk/include/linux/gfp.h +++ b/trunk/include/linux/gfp.h @@ -30,11 +30,7 @@ struct vm_area_struct; #define ___GFP_HARDWALL 0x20000u #define ___GFP_THISNODE 0x40000u #define ___GFP_RECLAIMABLE 0x80000u -#ifdef CONFIG_KMEMCHECK #define ___GFP_NOTRACK 0x200000u -#else -#define ___GFP_NOTRACK 0 -#endif #define ___GFP_OTHER_NODE 0x800000u #define ___GFP_WRITE 0x1000000u