lkml.org 
[lkml]   [2008]   [Jul]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] Make CONFIG_MIGRATION available for s390
    From
    Date
    Subject: [PATCH] Make CONFIG_MIGRATION available for s390

    From: Gerald Schaefer <gerald.schaefer@de.ibm.com>

    We'd like to support CONFIG_MEMORY_HOTREMOVE on s390, which depends on
    CONFIG_MIGRATION. So far, CONFIG_MIGRATION is only available with NUMA
    support.

    This patch makes CONFIG_MIGRATION selectable for architectures that define
    ARCH_ENABLE_MEMORY_HOTREMOVE. When MIGRATION is enabled w/o NUMA, the kernel
    won't compile because of a missing migrate() function in vm_operations_struct
    and a missing policy_zone reference in vma_migratable(). To avoid this,
    "#ifdef CONFIG_NUMA" is added to vma_migratable() and the vm_ops migrate()
    definition is moved from "#ifdef CONFIG_NUMA" to "#ifdef CONFIG_MIGRATION".

    Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
    ---

    include/linux/migrate.h | 2 ++
    include/linux/mm.h | 2 ++
    mm/Kconfig | 2 +-
    3 files changed, 5 insertions(+), 1 deletion(-)

    Index: linux-2.6/include/linux/migrate.h
    ===================================================================
    --- linux-2.6.orig/include/linux/migrate.h
    +++ linux-2.6/include/linux/migrate.h
    @@ -13,6 +13,7 @@ static inline int vma_migratable(struct
    {
    if (vma->vm_flags & (VM_IO|VM_HUGETLB|VM_PFNMAP|VM_RESERVED))
    return 0;
    +#ifdef CONFIG_NUMA
    /*
    * Migration allocates pages in the highest zone. If we cannot
    * do so then migration (at least from node to node) is not
    @@ -22,6 +23,7 @@ static inline int vma_migratable(struct
    gfp_zone(mapping_gfp_mask(vma->vm_file->f_mapping))
    < policy_zone)
    return 0;
    +#endif
    return 1;
    }

    Index: linux-2.6/include/linux/mm.h
    ===================================================================
    --- linux-2.6.orig/include/linux/mm.h
    +++ linux-2.6/include/linux/mm.h
    @@ -193,6 +193,8 @@ struct vm_operations_struct {
    */
    struct mempolicy *(*get_policy)(struct vm_area_struct *vma,
    unsigned long addr);
    +#endif
    +#ifdef CONFIG_MIGRATION
    int (*migrate)(struct vm_area_struct *vma, const nodemask_t *from,
    const nodemask_t *to, unsigned long flags);
    #endif
    Index: linux-2.6/mm/Kconfig
    ===================================================================
    --- linux-2.6.orig/mm/Kconfig
    +++ linux-2.6/mm/Kconfig
    @@ -174,7 +174,7 @@ config SPLIT_PTLOCK_CPUS
    config MIGRATION
    bool "Page migration"
    def_bool y
    - depends on NUMA
    + depends on NUMA || ARCH_ENABLE_MEMORY_HOTREMOVE
    help
    Allows the migration of the physical location of pages of processes
    while the virtual addresses are not changed. This is useful for


    \
     
     \ /
      Last update: 2008-07-06 16:39    [W:0.036 / U:119.708 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site