diff --git a/[refs] b/[refs] index 87d095cd3ed5..b7d48c42bf69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7b9fcbbc3b8593ff7dc587f90c2fe90a2fd1e6f +refs/heads/master: 3dab1bce8e840606e76f1bad5a009328e2aa35c7 diff --git a/trunk/include/linux/gfp.h b/trunk/include/linux/gfp.h index cb4089254f01..3a76faf6a3ee 100644 --- a/trunk/include/linux/gfp.h +++ b/trunk/include/linux/gfp.h @@ -92,7 +92,7 @@ struct vm_area_struct; */ #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK) -#define __GFP_BITS_SHIFT 23 /* Room for 23 __GFP_FOO bits */ +#define __GFP_BITS_SHIFT 24 /* Room for N __GFP_FOO bits */ #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1)) /* This equals 0, but use constants in case they ever change */