Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83504032 authored by Will Deacon's avatar Will Deacon Committed by Catalin Marinas
Browse files

arm64: Remove asm/memblock.h 



The arm64 asm/memblock.h header exists only to provide a function
prototype for arm64_memblock_init(), which is called only from
setup_arch().

Move the declaration into mmu.h, where it can live alongside other
init functions such as paging_init() and bootmem_init() without the
need for its own special header file.

Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 83a680dd

arch/arm64/include/asm/memblock.h

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 ARM Ltd.

 *

 * 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.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

#ifndef __ASM_MEMBLOCK_H

#define __ASM_MEMBLOCK_H



extern void arm64_memblock_init(void);



#endif

arch/arm64/include/asm/mmu.h

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ static inline struct bp_hardening_data *arm64_get_bp_hardening_data(void) 
static inline void arm64_apply_bp_hardening(void)	{ }

#endif	/* CONFIG_HARDEN_BRANCH_PREDICTOR */



extern void arm64_memblock_init(void);

extern void paging_init(void);

extern void bootmem_init(void);

extern void __iomem *early_io_map(phys_addr_t phys, unsigned long virt);

arch/arm64/kernel/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ 
#include <asm/cacheflush.h>

#include <asm/tlbflush.h>

#include <asm/traps.h>

#include <asm/memblock.h>

#include <asm/efi.h>

#include <asm/xen/hypervisor.h>

#include <asm/mmu_context.h>

arch/arm64/mm/mmu.c

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include <asm/setup.h>

#include <asm/sizes.h>

#include <asm/tlb.h>

#include <asm/memblock.h>

#include <asm/mmu_context.h>

#include <asm/ptdump.h>

#include <asm/tlbflush.h>