From 6903440f46654349e8cb6992b45ddfc102cb27f3 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Wed, 1 Feb 2006 03:05:27 -0800 Subject: [PATCH] --- yaml --- r: 19366 b: refs/heads/master c: ce2ea89ba101d976907128441ba3aca72a8804b9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/mmzone.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 900cdbb5661b..c9e258386e60 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79046ae07ae21245520ca0aab985ee6678a879f8 +refs/heads/master: ce2ea89ba101d976907128441ba3aca72a8804b9 diff --git a/trunk/include/linux/mmzone.h b/trunk/include/linux/mmzone.h index 88c30f844abf..ebfc238cc243 100644 --- a/trunk/include/linux/mmzone.h +++ b/trunk/include/linux/mmzone.h @@ -98,11 +98,14 @@ struct per_cpu_pageset { * of three zone modifier bits, we could require up to eight zonelists. * If the left most zone modifier is a "loner" then the highest valid * zonelist would be four allowing us to allocate only five zonelists. + * Use the first form for GFP_ZONETYPES when the left most bit is not + * a "loner", otherwise use the second. * * NOTE! Make sure this matches the zones in */ #define GFP_ZONEMASK 0x07 -#define GFP_ZONETYPES 5 +/* #define GFP_ZONETYPES (GFP_ZONEMASK + 1) */ /* Non-loner */ +#define GFP_ZONETYPES ((GFP_ZONEMASK + 1) / 2 + 1) /* Loner */ /* * On machines where it is needed (eg PCs) we divide physical memory