From: Anup Patel <anup@brainfault.org>
To: Palmer Dabbelt <palmer@sifive.com>, Albert Ou <aou@eecs.berkeley.edu>
Cc: Anup Patel <anup.patel@wdc.com>,
linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@infradead.org>,
Atish Patra <atish.patra@wdc.com>,
Paul Walmsley <paul.walmsley@sifive.com>,
linux-riscv@lists.infradead.org
Subject: [PATCH 1/5] RISC-V: Move free_initrd_mem() to kernel/setup.c
Date: Mon, 7 Jan 2019 21:40:43 +0530 [thread overview]
Message-ID: <20190107161047.10516-2-anup@brainfault.org> (raw)
In-Reply-To: <20190107161047.10516-1-anup@brainfault.org>
From: Anup Patel <anup.patel@wdc.com>
We move free_initrd_mem() to kernel/setup.c so that all initrd
related functions are in one place.
Signed-off-by: Anup Patel <anup.patel@wdc.com>
---
arch/riscv/kernel/setup.c | 4 ++++
arch/riscv/mm/init.c | 7 -------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c
index fc8006a042eb..64646d0b4d53 100644
--- a/arch/riscv/kernel/setup.c
+++ b/arch/riscv/kernel/setup.c
@@ -96,6 +96,10 @@ static void __init setup_initrd(void)
initrd_start = 0;
initrd_end = 0;
}
+
+void free_initrd_mem(unsigned long start, unsigned long end)
+{
+}
#endif /* CONFIG_BLK_DEV_INITRD */
pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss;
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index 1d9bfaff60bc..f354486f9b78 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -14,7 +14,6 @@
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/memblock.h>
-#include <linux/initrd.h>
#include <linux/swap.h>
#include <linux/sizes.h>
@@ -63,9 +62,3 @@ void free_initmem(void)
{
free_initmem_default(0);
}
-
-#ifdef CONFIG_BLK_DEV_INITRD
-void free_initrd_mem(unsigned long start, unsigned long end)
-{
-}
-#endif /* CONFIG_BLK_DEV_INITRD */
--
2.17.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2019-01-07 16:11 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-07 16:10 [PATCH 0/5] Fixmap support and MM cleanups Anup Patel
2019-01-07 16:10 ` Anup Patel [this message]
2019-01-15 13:43 ` [PATCH 1/5] RISC-V: Move free_initrd_mem() to kernel/setup.c Christoph Hellwig
2019-01-19 10:34 ` Anup Patel
2019-01-07 16:10 ` [PATCH 2/5] RISC-V: Setup init_mm before parse_early_param() Anup Patel
2019-01-15 13:44 ` Christoph Hellwig
2019-01-19 10:42 ` Anup Patel
2019-01-07 16:10 ` [PATCH 3/5] RISC-V: Move setup_bootmem() to mm/init.c Anup Patel
2019-01-15 13:44 ` Christoph Hellwig
2019-01-19 10:43 ` Anup Patel
2019-01-07 16:10 ` [PATCH 4/5] RISC-V: Move setup_vm() " Anup Patel
2019-01-15 13:45 ` Christoph Hellwig
2019-01-07 16:10 ` [PATCH 5/5] RISC-V: Implement compile-time fixed mappings Anup Patel
2019-01-15 13:47 ` Christoph Hellwig
2019-01-19 10:44 ` Anup Patel
2019-01-19 11:44 ` Anup Patel
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=20190107161047.10516-2-anup@brainfault.org \
--to=anup@brainfault.org \
--cc=anup.patel@wdc.com \
--cc=aou@eecs.berkeley.edu \
--cc=atish.patra@wdc.com \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@sifive.com \
--cc=paul.walmsley@sifive.com \
/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).