diff options
author | Jonas Rabenstein <jonas.rabenstein@studium.uni-erlangen.de> | 2015-07-29 07:07:57 -0400 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2015-07-29 13:32:09 -0400 |
commit | 377bcff9a38a78083d7fff8e8a41cc894cf7813b (patch) | |
tree | b244470881c5377f62edf8ff1be616a09bf8c1a2 /arch/arm64/kernel/setup.c | |
parent | 766ffb69803943c2b580a44ac14a189b875d21f6 (diff) |
arm64: remove dead-code depending on CONFIG_UP_LATE_INIT
Commit 4b3dc9679cf7 ("arm64: force CONFIG_SMP=y and remove redundant
and therfore can not be selected anymore.
Remove dead #ifdef-block depending on UP_LATE_INIT in
arch/arm64/kernel/setup.c
Signed-off-by: Jonas Rabenstein <jonas.rabenstein@studium.uni-erlangen.de>
[will: kill do_post_cpus_up_work altogether]
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel/setup.c')
-rw-r--r-- | arch/arm64/kernel/setup.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index be65ecc89e82..0c8fd975306b 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c | |||
@@ -63,7 +63,6 @@ | |||
63 | #include <asm/memblock.h> | 63 | #include <asm/memblock.h> |
64 | #include <asm/psci.h> | 64 | #include <asm/psci.h> |
65 | #include <asm/efi.h> | 65 | #include <asm/efi.h> |
66 | #include <asm/virt.h> | ||
67 | #include <asm/xen/hypervisor.h> | 66 | #include <asm/xen/hypervisor.h> |
68 | 67 | ||
69 | unsigned long elf_hwcap __read_mostly; | 68 | unsigned long elf_hwcap __read_mostly; |
@@ -197,30 +196,6 @@ static void __init smp_build_mpidr_hash(void) | |||
197 | __flush_dcache_area(&mpidr_hash, sizeof(struct mpidr_hash)); | 196 | __flush_dcache_area(&mpidr_hash, sizeof(struct mpidr_hash)); |
198 | } | 197 | } |
199 | 198 | ||
200 | static void __init hyp_mode_check(void) | ||
201 | { | ||
202 | if (is_hyp_mode_available()) | ||
203 | pr_info("CPU: All CPU(s) started at EL2\n"); | ||
204 | else if (is_hyp_mode_mismatched()) | ||
205 | WARN_TAINT(1, TAINT_CPU_OUT_OF_SPEC, | ||
206 | "CPU: CPUs started in inconsistent modes"); | ||
207 | else | ||
208 | pr_info("CPU: All CPU(s) started at EL1\n"); | ||
209 | } | ||
210 | |||
211 | void __init do_post_cpus_up_work(void) | ||
212 | { | ||
213 | hyp_mode_check(); | ||
214 | apply_alternatives_all(); | ||
215 | } | ||
216 | |||
217 | #ifdef CONFIG_UP_LATE_INIT | ||
218 | void __init up_late_init(void) | ||
219 | { | ||
220 | do_post_cpus_up_work(); | ||
221 | } | ||
222 | #endif /* CONFIG_UP_LATE_INIT */ | ||
223 | |||
224 | static void __init setup_processor(void) | 199 | static void __init setup_processor(void) |
225 | { | 200 | { |
226 | u64 features; | 201 | u64 features; |