diff options
author | Will Deacon <will.deacon@arm.com> | 2019-01-14 09:22:24 -0500 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2019-01-21 12:31:15 -0500 |
commit | 83504032e6ddcc8b0942aa24dfad5db849090c9f (patch) | |
tree | 321a061171fadab6e59efd87802d8bb98d1598fb | |
parent | 83a680dd97ad2d1ed7a6355aa5baddbc0c8ae2ae (diff) |
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: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-rw-r--r-- | arch/arm64/include/asm/memblock.h | 21 | ||||
-rw-r--r-- | arch/arm64/include/asm/mmu.h | 1 | ||||
-rw-r--r-- | arch/arm64/kernel/setup.c | 1 | ||||
-rw-r--r-- | arch/arm64/mm/mmu.c | 1 |
4 files changed, 1 insertions, 23 deletions
diff --git a/arch/arm64/include/asm/memblock.h b/arch/arm64/include/asm/memblock.h deleted file mode 100644 index 6afeed2467f1..000000000000 --- a/arch/arm64/include/asm/memblock.h +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2012 ARM Ltd. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | #ifndef __ASM_MEMBLOCK_H | ||
17 | #define __ASM_MEMBLOCK_H | ||
18 | |||
19 | extern void arm64_memblock_init(void); | ||
20 | |||
21 | #endif | ||
diff --git a/arch/arm64/include/asm/mmu.h b/arch/arm64/include/asm/mmu.h index 3e8063f4f9d3..67ef25d037ea 100644 --- a/arch/arm64/include/asm/mmu.h +++ b/arch/arm64/include/asm/mmu.h | |||
@@ -129,6 +129,7 @@ static inline struct bp_hardening_data *arm64_get_bp_hardening_data(void) | |||
129 | static inline void arm64_apply_bp_hardening(void) { } | 129 | static inline void arm64_apply_bp_hardening(void) { } |
130 | #endif /* CONFIG_HARDEN_BRANCH_PREDICTOR */ | 130 | #endif /* CONFIG_HARDEN_BRANCH_PREDICTOR */ |
131 | 131 | ||
132 | extern void arm64_memblock_init(void); | ||
132 | extern void paging_init(void); | 133 | extern void paging_init(void); |
133 | extern void bootmem_init(void); | 134 | extern void bootmem_init(void); |
134 | extern void __iomem *early_io_map(phys_addr_t phys, unsigned long virt); | 135 | extern void __iomem *early_io_map(phys_addr_t phys, unsigned long virt); |
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 4b0e1231625c..71f5fbb12608 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c | |||
@@ -58,7 +58,6 @@ | |||
58 | #include <asm/cacheflush.h> | 58 | #include <asm/cacheflush.h> |
59 | #include <asm/tlbflush.h> | 59 | #include <asm/tlbflush.h> |
60 | #include <asm/traps.h> | 60 | #include <asm/traps.h> |
61 | #include <asm/memblock.h> | ||
62 | #include <asm/efi.h> | 61 | #include <asm/efi.h> |
63 | #include <asm/xen/hypervisor.h> | 62 | #include <asm/xen/hypervisor.h> |
64 | #include <asm/mmu_context.h> | 63 | #include <asm/mmu_context.h> |
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index b6f5aa52ac67..d6b6f1b169bb 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c | |||
@@ -42,7 +42,6 @@ | |||
42 | #include <asm/setup.h> | 42 | #include <asm/setup.h> |
43 | #include <asm/sizes.h> | 43 | #include <asm/sizes.h> |
44 | #include <asm/tlb.h> | 44 | #include <asm/tlb.h> |
45 | #include <asm/memblock.h> | ||
46 | #include <asm/mmu_context.h> | 45 | #include <asm/mmu_context.h> |
47 | #include <asm/ptdump.h> | 46 | #include <asm/ptdump.h> |
48 | #include <asm/tlbflush.h> | 47 | #include <asm/tlbflush.h> |