Skip to content

Commit

Permalink
memblock: add error return when CONFIG_HAVE_MEMBLOCK is not set
Browse files Browse the repository at this point in the history
On larger systems, information in the kernel log is lost because there is
so much early text printed, that it overflows the static log buffer before
the log_buf_len kernel parameter can be processed, and a bigger log buffer
allocated.

Distros are relunctant to increase memory usage by increasing the size of
the static log buffer, so minimize the problem by allocating the new log
buffer as early as possible.

This patch:

Add an error return if CONFIG_HAVE_MEMBLOCK is not set instead of having
to add #ifdef CONFIG_HAVE_MEMBLOCK around blocks of code calling that
function.

Signed-off-by: Mike Travis <travis@sgi.com>
Cc: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Jack Steiner <steiner@sgi.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Yinghai Lu authored and Linus Torvalds committed May 25, 2011
1 parent d9be9b9 commit 95dde50
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion include/linux/memblock.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
#define _LINUX_MEMBLOCK_H
#ifdef __KERNEL__

#define MEMBLOCK_ERROR 0

#ifdef CONFIG_HAVE_MEMBLOCK
/*
* Logical memory blocks.
Expand All @@ -20,7 +22,6 @@
#include <asm/memblock.h>

#define INIT_MEMBLOCK_REGIONS 128
#define MEMBLOCK_ERROR 0

struct memblock_region {
phys_addr_t base;
Expand Down Expand Up @@ -160,6 +161,12 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo
#define __initdata_memblock
#endif

#else
static inline phys_addr_t memblock_alloc(phys_addr_t size, phys_addr_t align)
{
return MEMBLOCK_ERROR;
}

#endif /* CONFIG_HAVE_MEMBLOCK */

#endif /* __KERNEL__ */
Expand Down

0 comments on commit 95dde50

Please sign in to comment.