From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 09/12] rename include/mem_malloc.h to include/memory.h
Date: Fri, 23 Sep 2011 11:24:17 +0200 [thread overview]
Message-ID: <1316769860-24549-10-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1316769860-24549-1-git-send-email-s.hauer@pengutronix.de>
Which is a better name and also better to collect other
things.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/lib/arm.c | 2 +-
arch/blackfin/lib/board.c | 2 +-
arch/mips/lib/memory.c | 2 +-
arch/nios2/lib/board.c | 2 +-
arch/ppc/boards/pcm030/pcm030.c | 2 +-
arch/ppc/lib/board.c | 2 +-
arch/x86/lib/memory.c | 2 +-
common/dlmalloc.c | 2 +-
common/startup.c | 2 +-
include/mem_malloc.h | 10 ----------
include/memory.h | 10 ++++++++++
11 files changed, 19 insertions(+), 19 deletions(-)
delete mode 100644 include/mem_malloc.h
create mode 100644 include/memory.h
diff --git a/arch/arm/lib/arm.c b/arch/arm/lib/arm.c
index 6549118..c85aae1 100644
--- a/arch/arm/lib/arm.c
+++ b/arch/arm/lib/arm.c
@@ -1,6 +1,6 @@
#include <common.h>
#include <init.h>
-#include <mem_malloc.h>
+#include <memory.h>
#include <asm/barebox-arm.h>
#include <asm-generic/memory_layout.h>
diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c
index 581947b..d1b39fa 100644
--- a/arch/blackfin/lib/board.c
+++ b/arch/blackfin/lib/board.c
@@ -31,7 +31,7 @@
#include <net.h>
#include <init.h>
#include <environment.h>
-#include <mem_malloc.h>
+#include <memory.h>
#include <asm/cpu.h>
#include <asm-generic/memory_layout.h>
diff --git a/arch/mips/lib/memory.c b/arch/mips/lib/memory.c
index 23a995c..ad9f6a6 100644
--- a/arch/mips/lib/memory.c
+++ b/arch/mips/lib/memory.c
@@ -20,7 +20,7 @@
#include <common.h>
#include <init.h>
-#include <mem_malloc.h>
+#include <memory.h>
#include <asm-generic/memory_layout.h>
static int mips_mem_malloc_init(void)
diff --git a/arch/nios2/lib/board.c b/arch/nios2/lib/board.c
index 7cbff40..07f045b 100644
--- a/arch/nios2/lib/board.c
+++ b/arch/nios2/lib/board.c
@@ -23,7 +23,7 @@
#include <common.h>
#include <malloc.h>
#include <init.h>
-#include <mem_malloc.h>
+#include <memory.h>
#include <asm-generic/memory_layout.h>
#include <cache.h>
diff --git a/arch/ppc/boards/pcm030/pcm030.c b/arch/ppc/boards/pcm030/pcm030.c
index 3c2db4e..d3b7094 100644
--- a/arch/ppc/boards/pcm030/pcm030.c
+++ b/arch/ppc/boards/pcm030/pcm030.c
@@ -34,7 +34,7 @@
#include <mach/fec.h>
#include <types.h>
#include <partition.h>
-#include <mem_malloc.h>
+#include <memory.h>
#include <reloc.h>
static struct mpc5xxx_fec_platform_data fec_info = {
diff --git a/arch/ppc/lib/board.c b/arch/ppc/lib/board.c
index 7f8118e..798c386 100644
--- a/arch/ppc/lib/board.c
+++ b/arch/ppc/lib/board.c
@@ -26,7 +26,7 @@
#include <watchdog.h>
#include <command.h>
#include <malloc.h>
-#include <mem_malloc.h>
+#include <memory.h>
#include <init.h>
#include <net.h>
#include <reloc.h>
diff --git a/arch/x86/lib/memory.c b/arch/x86/lib/memory.c
index 9496d22..fa7bc03 100644
--- a/arch/x86/lib/memory.c
+++ b/arch/x86/lib/memory.c
@@ -27,7 +27,7 @@
#include <init.h>
#include <stdio.h>
-#include <mem_malloc.h>
+#include <memory.h>
#include <asm/syslib.h>
#include <asm-generic/memory_layout.h>
diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index f9e1828..7ad368e 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -2,7 +2,7 @@
#include <config.h>
#include <malloc.h>
#include <string.h>
-#include <mem_malloc.h>
+#include <memory.h>
#include <stdio.h>
#include <module.h>
diff --git a/common/startup.c b/common/startup.c
index bf67aef..7a1b602 100644
--- a/common/startup.c
+++ b/common/startup.c
@@ -33,7 +33,7 @@
#include <init.h>
#include <command.h>
#include <malloc.h>
-#include <mem_malloc.h>
+#include <memory.h>
#include <debug_ll.h>
#include <fs.h>
#include <linux/stat.h>
diff --git a/include/mem_malloc.h b/include/mem_malloc.h
deleted file mode 100644
index 67b19d7..0000000
--- a/include/mem_malloc.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __MEM_MALLOC_H
-#define __MEM_MALLOC_H
-
-#include <linux/types.h>
-
-void mem_malloc_init(void *start, void *end);
-ulong mem_malloc_start(void);
-ulong mem_malloc_end(void);
-
-#endif
diff --git a/include/memory.h b/include/memory.h
new file mode 100644
index 0000000..67b19d7
--- /dev/null
+++ b/include/memory.h
@@ -0,0 +1,10 @@
+#ifndef __MEM_MALLOC_H
+#define __MEM_MALLOC_H
+
+#include <linux/types.h>
+
+void mem_malloc_init(void *start, void *end);
+ulong mem_malloc_start(void);
+ulong mem_malloc_end(void);
+
+#endif
--
1.7.6.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2011-09-23 9:24 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-23 9:24 patches for next Sascha Hauer
2011-09-23 9:24 ` [PATCH 01/12] introduce io.h Sascha Hauer
2011-09-23 9:24 ` [PATCH 02/12] introduce asm-generic/io.h Sascha Hauer
2011-09-23 9:24 ` [PATCH 03/12] arm: use asm-generic/io.h Sascha Hauer
2011-09-23 9:24 ` [PATCH 04/12] Jean-christophe, more careful please Sascha Hauer
2011-09-23 12:43 ` Jean-Christophe PLAGNIOL-VILLARD
2011-09-23 14:29 ` Sascha Hauer
2011-09-23 14:33 ` Sascha Hauer
2011-09-23 9:24 ` [PATCH 05/12] add cpu native ordered io accessors Sascha Hauer
2011-09-23 9:24 ` [PATCH 06/12] cfi flash: use cpu native accessors Sascha Hauer
2011-09-23 9:24 ` [PATCH 07/12] ppc pcm030: remove puts in early init Sascha Hauer
2011-09-23 9:24 ` [PATCH 08/12] cfi flash: fix flash_make_cmd for big endian access Sascha Hauer
2011-09-23 9:26 ` Sascha Hauer
2011-09-23 14:05 ` Teresa Gamez
2011-09-23 14:27 ` Sascha Hauer
2011-09-23 9:24 ` Sascha Hauer [this message]
2011-09-23 9:24 ` [PATCH 10/12] ARM mmu: find second level descriptors by walking the page table Sascha Hauer
2011-09-23 9:24 ` [PATCH 11/12] introduce generic memory bank handling Sascha Hauer
2011-09-23 9:24 ` [PATCH 12/12] ARM: switch to generic memory banks Sascha Hauer
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=1316769860-24549-10-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.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