Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit d6de9d5349db61e134ab7fb6b2436a4c7938714c

Authored by Xishi Qiu
Committed by Linus Torvalds
1 parent b38a872596
Exists in master and in 16 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

mm/memory_hotplug.c: rename the function is_memblock_offlined_cb() 

A is_memblock_offlined() return or 1 means memory block is offlined, but
is_memblock_offlined_cb() returning 1 means memory block is not offlined,
this will confuse somebody, so rename the function.

Signed-off-by: Xishi Qiu <qiuxishi@huawei.com>
Acked-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -1701,7 +1701,7 @@
1701 1701 }
1702 1702  
1703 1703 #ifdef CONFIG_MEMORY_HOTREMOVE
1704   -static int is_memblock_offlined_cb(struct memory_block *mem, void *arg)
  1704 +static int check_memblock_offlined_cb(struct memory_block *mem, void *arg)
1705 1705 {
1706 1706 int ret = !is_memblock_offlined(mem);
1707 1707  
... ... @@ -1853,7 +1853,7 @@
1853 1853 * if this is not the case.
1854 1854 */
1855 1855 ret = walk_memory_range(PFN_DOWN(start), PFN_UP(start + size - 1), NULL,
1856   - is_memblock_offlined_cb);
  1856 + check_memblock_offlined_cb);
1857 1857 if (ret) {
1858 1858 unlock_memory_hotplug();
1859 1859 BUG();