The patch titled
get-rid-of-zone_table-fix 2
has been added to the -mm tree. Its filename is
get-rid-of-zone_table-fix-2.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: get-rid-of-zone_table-fix 2
From: Christoph Lameter <clameter@xxxxxxx>
There is still a problem after Andy's patch in connection with Optional
ZONE DMA that I pointed out earlier. If we only have a single zone then
ZONEID_PGSHIFT == 0. This is fine for the non NUMA case in which we have
only a single zone and ZONEID_MASK == 0 too. page_zone_id() will always be
0.
In the NUMA case we still have one zone per node. Thus we need to have a
correct ZONEID_PGSHIFT in order to isolate the node number from page flags.
Right now we take NODES_SHIFT bits starting from 0!
I am not exactly sure how to fix that the right way given the complex
nested macros. Andy may know.
The following patch checks for that condition. We can only allow
ZONEID_PGSHIFT to be zero if the ZONEID_MASK is also zero. (We cannot
check that with an #if because ZONEID_SHIFT contains a "sizeof(...)"
element)
Signed-off-by: Christoph Lameter <clameter@xxxxxxx>
Cc: Andy Whitcroft <apw@xxxxxxxxxxxx>
Cc: Dave Hansen <haveblue@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/mm.h | 1 +
1 file changed, 1 insertion(+)
diff -puN include/linux/mm.h~get-rid-of-zone_table-fix-2 include/linux/mm.h
--- a/include/linux/mm.h~get-rid-of-zone_table-fix-2
+++ a/include/linux/mm.h
@@ -445,6 +445,7 @@ static inline enum zone_type page_zonenu
*/
static inline int page_zone_id(struct page *page)
{
+ BUG_ON(ZONEID_PGSHIFT == 0 && ZONEID_MASK);
return (page->flags >> ZONEID_PGSHIFT) & ZONEID_MASK;
}
_
Patches currently in -mm which might be from clameter@xxxxxxx are
origin.patch
get-rid-of-zone_table.patch
get-rid-of-zone_table-fix.patch
get-rid-of-zone_table-fix-2.patch
deal-with-cases-of-zone_dma-meaning-the-first-zone.patch
deal-with-cases-of-zone_dma-meaning-the-first-zone-fix.patch
get-rid-of-zone_table-fix-3.patch
introduce-config_zone_dma.patch
optional-zone_dma-in-the-vm.patch
optional-zone_dma-for-ia64.patch
remove-zone_dma-remains-from-parisc.patch
remove-zone_dma-remains-from-sh-sh64.patch
set-config_zone_dma-for-arches-with-generic_isa_dma.patch
radix-tree-rcu-lockless-readside.patch
scheduler-numa-aware-placement-of-sched_group_allnodes.patch
zvc-support-nr_slab_reclaimable--nr_slab_unreclaimable-swap_prefetch.patch
reduce-max_nr_zones-swap_prefetch-remove-incorrect-use-of-zone_highmem.patch
numa-add-zone_to_nid-function-swap_prefetch.patch
readahead-state-based-method-aging-accounting-apply-type-enum-zone_type-readahead.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
