aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMike Frysinger2009-11-03 11:35:59 -0500
committerWolfgang Denk2010-01-21 22:26:00 +0100
commita16028da63c78001823bfb375b3f6d9d86e5a534 (patch)
treeaea901c9aabc6df0cf0db97e55ec39a55d76b653 /include
parentdac4d7e8849d275023ea2fcae6caf941db91c042 (diff)
lmb: only force on arches that use it
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-m68k/config.h2
-rw-r--r--include/asm-ppc/config.h2
-rw-r--r--include/asm-sparc/config.h2
-rw-r--r--include/image.h2
-rw-r--r--include/lmb.h4
5 files changed, 11 insertions, 1 deletions
diff --git a/include/asm-m68k/config.h b/include/asm-m68k/config.h
index 049c44eaf84..36438be112f 100644
--- a/include/asm-m68k/config.h
+++ b/include/asm-m68k/config.h
@@ -21,4 +21,6 @@
#ifndef _ASM_CONFIG_H_
#define _ASM_CONFIG_H_
+#define CONFIG_LMB
+
#endif
diff --git a/include/asm-ppc/config.h b/include/asm-ppc/config.h
index 796707eaf74..0d78aa400e5 100644
--- a/include/asm-ppc/config.h
+++ b/include/asm-ppc/config.h
@@ -21,6 +21,8 @@
#ifndef _ASM_CONFIG_H_
#define _ASM_CONFIG_H_
+#define CONFIG_LMB
+
#ifndef CONFIG_MAX_MEM_MAPPED
#if defined(CONFIG_4xx) || defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
#define CONFIG_MAX_MEM_MAPPED ((phys_size_t)2 << 30)
diff --git a/include/asm-sparc/config.h b/include/asm-sparc/config.h
index 049c44eaf84..36438be112f 100644
--- a/include/asm-sparc/config.h
+++ b/include/asm-sparc/config.h
@@ -21,4 +21,6 @@
#ifndef _ASM_CONFIG_H_
#define _ASM_CONFIG_H_
+#define CONFIG_LMB
+
#endif
diff --git a/include/image.h b/include/image.h
index dcf3a7bb18a..4ed03791069 100644
--- a/include/image.h
+++ b/include/image.h
@@ -256,7 +256,7 @@ typedef struct bootm_headers {
#define BOOTM_STATE_OS_GO (0x00000080)
int state;
-#ifndef USE_HOSTCC
+#ifdef CONFIG_LMB
struct lmb lmb; /* for memory mgmt */
#endif
} bootm_headers_t;
diff --git a/include/lmb.h b/include/lmb.h
index 14e8727f066..43082a393fd 100644
--- a/include/lmb.h
+++ b/include/lmb.h
@@ -52,6 +52,10 @@ lmb_size_bytes(struct lmb_region *type, unsigned long region_nr)
{
return type->region[region_nr].size;
}
+
+void board_lmb_reserve(struct lmb *lmb);
+void arch_lmb_reserve(struct lmb *lmb);
+
#endif /* __KERNEL__ */
#endif /* _LINUX_LMB_H */