Commit 87c55870 authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

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.

[akpm@linux-foundation.org: make memblock_dbg() safer and neater]

Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarBaoquan He <bhe@redhat.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Daniel Axtens <dja@axtens.net>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Emil Renner Berthing <kernel@esmil.dk>
Cc: Hari Bathini <hbathini@linux.ibm.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will@kernel.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Link: https://lkml.kernel.org/r/20200818151634.14343-10-rppt@kernel.org


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cd991db8

arch/s390/kernel/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -776,7 +776,7 @@ static void __init memblock_add_mem_detect_info(void) 
	unsigned long start, end;

	int i;



	memblock_dbg("physmem info source: %s (%hhd)\n",

	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);

include/linux/memblock.h

+1 −11
Original line number Diff line number Diff line
@@ -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_addr_t base, phys_addr_t size); 
bool 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

+14 −2
Original line number Diff line number Diff line
@@ -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_dump(struct memblock_type *type) 
	}

}



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(void) 
#endif

}



void __init_memblock memblock_dump_all(void)

{

	if (memblock_debug)

		__memblock_dump_all();

}



void __init memblock_allow_resize(void)

{

	memblock_can_resize = 1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE