mirror of
https://github.com/torvalds/linux.git
synced 2024-11-19 10:31:48 +00:00
57c8a661d9
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.8 KiB
C
82 lines
1.8 KiB
C
/*
|
|
* MIPS support for CONFIG_OF device tree support
|
|
*
|
|
* Copyright (C) 2010 Cisco Systems Inc. <dediao@cisco.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/export.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/types.h>
|
|
#include <linux/memblock.h>
|
|
#include <linux/debugfs.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_fdt.h>
|
|
#include <linux/of_platform.h>
|
|
|
|
#include <asm/bootinfo.h>
|
|
#include <asm/page.h>
|
|
#include <asm/prom.h>
|
|
|
|
static char mips_machine_name[64] = "Unknown";
|
|
|
|
__init void mips_set_machine_name(const char *name)
|
|
{
|
|
if (name == NULL)
|
|
return;
|
|
|
|
strlcpy(mips_machine_name, name, sizeof(mips_machine_name));
|
|
pr_info("MIPS: machine is %s\n", mips_get_machine_name());
|
|
}
|
|
|
|
char *mips_get_machine_name(void)
|
|
{
|
|
return mips_machine_name;
|
|
}
|
|
|
|
#ifdef CONFIG_USE_OF
|
|
void __init early_init_dt_add_memory_arch(u64 base, u64 size)
|
|
{
|
|
return add_memory_region(base, size, BOOT_MEM_RAM);
|
|
}
|
|
|
|
int __init early_init_dt_reserve_memory_arch(phys_addr_t base,
|
|
phys_addr_t size, bool nomap)
|
|
{
|
|
add_memory_region(base, size, BOOT_MEM_RESERVED);
|
|
return 0;
|
|
}
|
|
|
|
void __init __dt_setup_arch(void *bph)
|
|
{
|
|
if (!early_init_dt_scan(bph))
|
|
return;
|
|
|
|
mips_set_machine_name(of_flat_dt_get_machine_name());
|
|
}
|
|
|
|
int __init __dt_register_buses(const char *bus0, const char *bus1)
|
|
{
|
|
static struct of_device_id of_ids[3];
|
|
|
|
if (!of_have_populated_dt())
|
|
panic("device tree not present");
|
|
|
|
strlcpy(of_ids[0].compatible, bus0, sizeof(of_ids[0].compatible));
|
|
if (bus1) {
|
|
strlcpy(of_ids[1].compatible, bus1,
|
|
sizeof(of_ids[1].compatible));
|
|
}
|
|
|
|
if (of_platform_populate(NULL, of_ids, NULL, NULL))
|
|
panic("failed to populate DT");
|
|
|
|
return 0;
|
|
}
|
|
|
|
#endif
|