Commit:     e228929bc257b963523ed75aa60d2ad77ece2189
Parent:     8d1b87530e7df5c9541a69910ef7f786f034eca0
Author:     Paul Mundt <[EMAIL PROTECTED]>
AuthorDate: Fri Jul 20 00:31:44 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Fri Jul 20 08:44:19 2007 -0700

    mm: fix memory hotplug oops from ZONE_MOVABLE changes.
    zone_movable_pfn is presently marked as __initdata and referenced from
    adjust_zone_range_for_zone_movable(), which in turn is referenced by
    zone_spanned_pages_in_node().  Both of these are __meminit annotated.  When
    memory hotplug is enabled, this will oops on a hot-add, due to
    zone_movable_pfn having been freed.
    __meminitdata annotation gives the desired behaviour.
    This will only impact platforms that enable both memory hotplug
    Signed-off-by: Paul Mundt <[EMAIL PROTECTED]>
    Acked-by: Mel Gorman <[EMAIL PROTECTED]>
    Acked-by: KAMEZAWA Hiroyuki <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 mm/page_alloc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 43cb3b3..40954fb 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -138,7 +138,7 @@ static unsigned long __meminitdata dma_reserve;
   unsigned long __initdata required_kernelcore;
   unsigned long __initdata required_movablecore;
-  unsigned long __initdata zone_movable_pfn[MAX_NUMNODES];
+  unsigned long __meminitdata zone_movable_pfn[MAX_NUMNODES];
   /* movable_zone is the "real" zone pages in ZONE_MOVABLE are taken from */
   int movable_zone;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to