lkml.org 
[lkml]   [2012]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[RFC PATCH v2 1/13] memory-hotplug : rename remove_memory to offline_memory
    remove_memory() does not remove memory but just offlines memory. The patch
    changes name of it to offline_memory().

    CC: David Rientjes <rientjes@google.com>
    CC: Jiang Liu <liuj97@gmail.com>
    CC: Len Brown <len.brown@intel.com>
    CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    CC: Paul Mackerras <paulus@samba.org>
    CC: Christoph Lameter <cl@linux.com>
    Cc: Minchan Kim <minchan.kim@gmail.com>
    CC: Andrew Morton <akpm@linux-foundation.org>
    CC: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>

    ---
    drivers/acpi/acpi_memhotplug.c | 2 +-
    drivers/base/memory.c | 4 ++--
    include/linux/memory_hotplug.h | 2 +-
    mm/memory_hotplug.c | 6 +++---
    4 files changed, 7 insertions(+), 7 deletions(-)

    Index: linux-3.5-rc4/drivers/acpi/acpi_memhotplug.c
    ===================================================================
    --- linux-3.5-rc4.orig/drivers/acpi/acpi_memhotplug.c 2012-07-03 14:21:46.102416917 +0900
    +++ linux-3.5-rc4/drivers/acpi/acpi_memhotplug.c 2012-07-03 14:21:49.458374960 +0900
    @@ -318,7 +318,7 @@ static int acpi_memory_disable_device(st
    */
    list_for_each_entry_safe(info, n, &mem_device->res_list, list) {
    if (info->enabled) {
    - result = remove_memory(info->start_addr, info->length);
    + result = offline_memory(info->start_addr, info->length);
    if (result)
    return result;
    }
    Index: linux-3.5-rc4/drivers/base/memory.c
    ===================================================================
    --- linux-3.5-rc4.orig/drivers/base/memory.c 2012-07-03 14:21:46.095417003 +0900
    +++ linux-3.5-rc4/drivers/base/memory.c 2012-07-03 14:21:49.459374948 +0900
    @@ -266,8 +266,8 @@ memory_block_action(unsigned long phys_i
    break;
    case MEM_OFFLINE:
    start_paddr = page_to_pfn(first_page) << PAGE_SHIFT;
    - ret = remove_memory(start_paddr,
    - nr_pages << PAGE_SHIFT);
    + ret = offline_memory(start_paddr,
    + nr_pages << PAGE_SHIFT);
    break;
    default:
    WARN(1, KERN_WARNING "%s(%ld, %ld) unknown action: "
    Index: linux-3.5-rc4/mm/memory_hotplug.c
    ===================================================================
    --- linux-3.5-rc4.orig/mm/memory_hotplug.c 2012-07-03 14:21:46.102416917 +0900
    +++ linux-3.5-rc4/mm/memory_hotplug.c 2012-07-03 14:21:49.466374860 +0900
    @@ -990,7 +990,7 @@ out:
    return ret;
    }

    -int remove_memory(u64 start, u64 size)
    +int offline_memory(u64 start, u64 size)
    {
    unsigned long start_pfn, end_pfn;

    @@ -999,9 +999,9 @@ int remove_memory(u64 start, u64 size)
    return offline_pages(start_pfn, end_pfn, 120 * HZ);
    }
    #else
    -int remove_memory(u64 start, u64 size)
    +int offline_memory(u64 start, u64 size)
    {
    return -EINVAL;
    }
    #endif /* CONFIG_MEMORY_HOTREMOVE */
    -EXPORT_SYMBOL_GPL(remove_memory);
    +EXPORT_SYMBOL_GPL(offline_memory);
    Index: linux-3.5-rc4/include/linux/memory_hotplug.h
    ===================================================================
    --- linux-3.5-rc4.orig/include/linux/memory_hotplug.h 2012-07-03 14:21:46.102416917 +0900
    +++ linux-3.5-rc4/include/linux/memory_hotplug.h 2012-07-03 14:21:49.471374796 +0900
    @@ -233,7 +233,7 @@ static inline int is_mem_section_removab
    extern int mem_online_node(int nid);
    extern int add_memory(int nid, u64 start, u64 size);
    extern int arch_add_memory(int nid, u64 start, u64 size);
    -extern int remove_memory(u64 start, u64 size);
    +extern int offline_memory(u64 start, u64 size);
    extern int sparse_add_one_section(struct zone *zone, unsigned long start_pfn,
    int nr_pages);
    extern void sparse_remove_one_section(struct zone *zone, struct mem_section *ms);


    \
     
     \ /
      Last update: 2012-07-03 08:41    [W:0.033 / U:59.920 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site