From: Mike Travis <travis@sgi.com>
To: Yinghai Lu <yinghai@kernel.org>, Ingo Molnar <mingo@elte.hu>
Cc: David Rientjes <rientjes@google.com>,
Jack Steiner <steiner@sgi.com>, Robin Holt <holt@sgi.com>,
Len Brown <len.brown@intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Andrew Morton <akpm@linux-foundation.org>,
linux-acpi@vger.kernel.org, x86@kernel.org,
linux-kernel@vger.kernel.org, Tejun Heo <tj@kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH 1/2] memblock: add error return when CONFIG_HAVE_MEMBLOCK is not set
Date: Wed, 30 Mar 2011 17:41:59 -0700 [thread overview]
Message-ID: <4D93CDD7.8000708@sgi.com> (raw)
In-Reply-To: <AANLkTi=Xf5RaF559QsRNijmG0YP7amkG569NZFhpt4QY@mail.gmail.com>
Subject: memblock: add error return when CONFIG_HAVE_MEMBLOCK is not set
Author: Yinghai Lu <yinghai@kernel.org>
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>
---
include/linux/memblock.h | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
--- linux.orig/include/linux/memblock.h
+++ linux/include/linux/memblock.h
@@ -2,6 +2,8 @@
#define _LINUX_MEMBLOCK_H
#ifdef __KERNEL__
+#define MEMBLOCK_ERROR 0
+
#ifdef CONFIG_HAVE_MEMBLOCK
/*
* Logical memory blocks.
@@ -20,7 +22,6 @@
#include <asm/memblock.h>
#define INIT_MEMBLOCK_REGIONS 128
-#define MEMBLOCK_ERROR 0
struct memblock_region {
phys_addr_t base;
@@ -160,6 +161,12 @@ static inline unsigned long memblock_reg
#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__ */
next prev parent reply other threads:[~2011-03-31 0:42 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-25 18:06 [PATCH 0/4] init: Shrink early messages to prevent overflowing the kernel log buffer Mike Travis
2011-02-25 18:06 ` [PATCH 1/4] printk: Allocate kernel log buffer earlier Mike Travis
2011-02-27 12:09 ` Ingo Molnar
2011-02-27 12:15 ` Ingo Molnar
2011-02-28 1:34 ` Yinghai Lu
2011-02-28 8:01 ` Ingo Molnar
2011-02-28 19:26 ` Mike Travis
2011-03-01 7:35 ` Ingo Molnar
2011-02-28 8:06 ` Ingo Molnar
2011-02-28 19:18 ` Yinghai Lu
2011-02-28 19:29 ` Mike Travis
2011-02-28 19:23 ` Mike Travis
2011-02-28 19:46 ` Yinghai Lu
2011-02-28 20:02 ` Mike Travis
2011-02-28 22:59 ` Yinghai Lu
2011-03-31 0:41 ` Mike Travis [this message]
2011-03-31 1:40 ` [PATCH 1/2] memblock: add error return when CONFIG_HAVE_MEMBLOCK is not set Yinghai Lu
2011-03-31 15:23 ` Mike Travis
2011-03-31 16:17 ` Yinghai Lu
2011-04-07 19:43 ` Mike Travis
2011-04-08 6:40 ` Ingo Molnar
2011-03-01 7:42 ` [PATCH 1/4] printk: Allocate kernel log buffer earlier Ingo Molnar
2011-02-28 19:14 ` Mike Travis
2011-02-25 18:06 ` [PATCH 2/4] printk: Break out printk_time Mike Travis
2011-02-27 11:56 ` Ingo Molnar
2011-02-25 18:06 ` [PATCH 3/4] printk: Minimize time zero output Mike Travis
2011-02-25 18:06 ` [PATCH 4/4] x86: Minimize SRAT messages Mike Travis
2011-02-27 12:03 ` Ingo Molnar
2011-02-28 19:41 ` Mike Travis
2011-03-01 7:51 ` Ingo Molnar
2011-03-31 2:38 ` Len Brown
2011-03-31 4:40 ` Yinghai Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D93CDD7.8000708@sgi.com \
--to=travis@sgi.com \
--cc=akpm@linux-foundation.org \
--cc=holt@sgi.com \
--cc=hpa@zytor.com \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rientjes@google.com \
--cc=steiner@sgi.com \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).