memblock-make-memblock_debug-and-related-functionality-private.patch removed from -mm tree
The patch titled
Subject: memblock: make memblock_debug and related functionality private
has been removed from the -mm tree. Its filename was
memblock-make-memblock_debug-and-related-functionality-private.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mike Rapoport <[email protected]>
Subject: memblock: make memblock_debug and related functionality private
The only user of memblock_dbg() outside memblock was s390 setup code and it is converted to use pr_debug() instead. This allows to stop exposing memblock_debug and memblock_dbg() to the rest of the kernel.
---
arch/s390/kernel/setup.c | 4 ++-- include/linux/memblock.h | 12 +----------- mm/memblock.c | 16 ++++++++++++++-- 3 files changed, 17 insertions(+), 15 deletions(-)
arch/s390/kernel/setup.c renamed from arch/s390/kernel/setup.c~memblock-make-memblock_debug-and-related-functionality-private +2 -2
@@ -776,8 +776,8 @@ static void __init memblock_add_mem_deteunsigned long start, end;int i; -memblock_dbg ("physmem info source: %s (%hhd)\n" , -get_mem_info_source (), mem_detect.info_source); +pr_debug ("physmem info source: %s (%hhd)\n" , +get_mem_info_source (), mem_detect.info_source);/* keep memblock lists close to the kernel */ memblock_set_bottom_up (true);for_each_mem_detect_block (i, &start, &end) {
include/linux/memblock.h renamed from include/linux/memblock.h~memblock-make-memblock_debug-and-related-functionality-private +1 -11
@@ -86,7 +86,6 @@ struct memblock { };extern struct memblock memblock; -extern int memblock_debug;#ifndef CONFIG_ARCH_KEEP_MEMBLOCK #define __init_memblock __meminit
@@ -98,9 +97,6 @@ void memblock_discard(void);static inline void memblock_discard (void ) {}#endif -#define memblock_dbg (fmt, ...) \ - if (memblock_debug) printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__) -phys_addr_t memblock_find_in_range (phys_addr_t start,phys_addr_t end,phys_addr_t size,phys_addr_t align);void memblock_allow_resize (void );
@@ -476,13 +472,7 @@ bool memblock_is_region_memory(phys_addrbool memblock_is_reserved (phys_addr_t addr);bool memblock_is_region_reserved (phys_addr_t base,phys_addr_t size); -extern void __memblock_dump_all (void ); - -static inline void memblock_dump_all (void ) -{ -if (memblock_debug) -__memblock_dump_all (); -} +void memblock_dump_all (void );/** * memblock_set_current_limit - Set the current allocation limit to allow
mm/memblock.c renamed from mm/memblock.c~memblock-make-memblock_debug-and-related-functionality-private +14 -2
@@ -137,7 +137,13 @@ struct memblock_type physmem = { i < memblock_type->cnt; \ i++, rgn = &memblock_type->regions[i]) -int memblock_debug __initdata_memblock; +#define memblock_dbg (fmt, ...) \ + do { \ + if (memblock_debug) \ + pr_info(fmt, ##__VA_ARGS__); \ + } while (0) + +static int memblock_debug __initdata_memblock; static bool system_has_some_mirror __initdata_memblock = false; static int memblock_can_resize __initdata_memblock; static int memblock_memory_in_slab __initdata_memblock = 0;
@@ -1920,7 +1926,7 @@ static void __init_memblock memblock_dum } } -void __init_memblock __memblock_dump_all(void) +static void __init_memblock __memblock_dump_all(void) {pr_info ("MEMBLOCK configuration:\n" ); pr_info(" memory size = %pa reserved size = %pa\n",
@@ -1934,6 +1940,12 @@ void __init_memblock __memblock_dump_all#endif } +void __init_memblock memblock_dump_all(void) +{ +if (memblock_debug) +__memblock_dump_all (); +} +void __init memblock_allow_resize (void ) { memblock_can_resize =1 ;
_
Patches currently in -mm which might be from [email protected] are
mm-remove-unused-early_pfn_valid.patch