mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
Move remaining definitions and declarations from include/linux/bootmem.h into include/linux/memblock.h and remove the redundant header. The includes were replaced with the semantic patch below and then semi-automated removal of duplicated '#include <linux/memblock.h> @@ @@ - #include <linux/bootmem.h> + #include <linux/memblock.h> [sfr@canb.auug.org.au: dma-direct: fix up for the removal of linux/bootmem.h] Link: http://lkml.kernel.org/r/20181002185342.133d1680@canb.auug.org.au [sfr@canb.auug.org.au: powerpc: fix up for removal of linux/bootmem.h] Link: http://lkml.kernel.org/r/20181005161406.73ef8727@canb.auug.org.au [sfr@canb.auug.org.au: x86/kaslr, ACPI/NUMA: fix for linux/bootmem.h removal] Link: http://lkml.kernel.org/r/20181008190341.5e396491@canb.auug.org.au Link: http://lkml.kernel.org/r/1536927045-23536-30-git-send-email-rppt@linux.vnet.ibm.com Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Michal Hocko <mhocko@suse.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Chris Zankel <chris@zankel.net> Cc: "David S. Miller" <davem@davemloft.net> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Greentime Hu <green.hu@gmail.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Guan Xuetao <gxt@pku.edu.cn> Cc: Ingo Molnar <mingo@redhat.com> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org> Cc: Jonas Bonn <jonas@southpole.se> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Ley Foon Tan <lftan@altera.com> Cc: Mark Salter <msalter@redhat.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Matt Turner <mattst88@gmail.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michal Simek <monstr@monstr.eu> Cc: Palmer Dabbelt <palmer@sifive.com> Cc: Paul Burton <paul.burton@mips.com> Cc: Richard Kuo <rkuo@codeaurora.org> Cc: Richard Weinberger <richard@nod.at> Cc: Rich Felker <dalias@libc.org> Cc: Russell King <linux@armlinux.org.uk> Cc: Serge Semin <fancer.lancer@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tony Luck <tony.luck@intel.com> Cc: Vineet Gupta <vgupta@synopsys.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
82 lines
1.6 KiB
C
82 lines
1.6 KiB
C
/*
|
|
* Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
|
* Licensed under the GPL
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/memblock.h>
|
|
#include <linux/initrd.h>
|
|
#include <asm/types.h>
|
|
#include <init.h>
|
|
#include <os.h>
|
|
|
|
/* Changed by uml_initrd_setup, which is a setup */
|
|
static char *initrd __initdata = NULL;
|
|
static int load_initrd(char *filename, void *buf, int size);
|
|
|
|
int __init read_initrd(void)
|
|
{
|
|
void *area;
|
|
long long size;
|
|
int err;
|
|
|
|
if (initrd == NULL)
|
|
return 0;
|
|
|
|
err = os_file_size(initrd, &size);
|
|
if (err)
|
|
return 0;
|
|
|
|
/*
|
|
* This is necessary because alloc_bootmem craps out if you
|
|
* ask for no memory.
|
|
*/
|
|
if (size == 0) {
|
|
printk(KERN_ERR "\"%s\" is a zero-size initrd\n", initrd);
|
|
return 0;
|
|
}
|
|
|
|
area = memblock_alloc(size, 0);
|
|
|
|
if (load_initrd(initrd, area, size) == -1)
|
|
return 0;
|
|
|
|
initrd_start = (unsigned long) area;
|
|
initrd_end = initrd_start + size;
|
|
return 0;
|
|
}
|
|
|
|
static int __init uml_initrd_setup(char *line, int *add)
|
|
{
|
|
initrd = line;
|
|
return 0;
|
|
}
|
|
|
|
__uml_setup("initrd=", uml_initrd_setup,
|
|
"initrd=<initrd image>\n"
|
|
" This is used to boot UML from an initrd image. The argument is the\n"
|
|
" name of the file containing the image.\n\n"
|
|
);
|
|
|
|
static int load_initrd(char *filename, void *buf, int size)
|
|
{
|
|
int fd, n;
|
|
|
|
fd = os_open_file(filename, of_read(OPENFLAGS()), 0);
|
|
if (fd < 0) {
|
|
printk(KERN_ERR "Opening '%s' failed - err = %d\n", filename,
|
|
-fd);
|
|
return -1;
|
|
}
|
|
n = os_read_file(fd, buf, size);
|
|
if (n != size) {
|
|
printk(KERN_ERR "Read of %d bytes from '%s' failed, "
|
|
"err = %d\n", size,
|
|
filename, -n);
|
|
return -1;
|
|
}
|
|
|
|
os_close_file(fd);
|
|
return 0;
|
|
}
|