diff --git a/[refs] b/[refs] index 48cc8248280f..60cacbac28b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9276b1bc96a132f4068fdee00983c532f43d3a26 +refs/heads/master: 7253f4ef04b1cd138baf2b29a95473743ac0a307 diff --git a/trunk/include/linux/mmzone.h b/trunk/include/linux/mmzone.h index 09bf9d8d7b72..da6002dec205 100644 --- a/trunk/include/linux/mmzone.h +++ b/trunk/include/linux/mmzone.h @@ -352,8 +352,8 @@ struct zone { struct zonelist_cache { - DECLARE_BITMAP(fullzones, MAX_ZONES_PER_ZONELIST); /* zone full? */ unsigned short z_to_n[MAX_ZONES_PER_ZONELIST]; /* zone->nid */ + DECLARE_BITMAP(fullzones, MAX_ZONES_PER_ZONELIST); /* zone full? */ unsigned long last_full_zap; /* when last zap'd (jiffies) */ }; #else