diff options
| author | Tony Lindgren <tony@atomide.com> | 2019-08-13 12:40:10 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2019-08-13 12:40:10 +0200 |
| commit | 58e16d792a6a8c6b750f637a4649967fcac853dc (patch) | |
| tree | 778a940499ecfc6fb2d811dbfef735913d30618a /arch/xtensa/kernel/setup.c | |
| parent | ARM: OMAP1: ams-delta-fiq: Fix missing irq_ack (diff) | |
| parent | bus: ti-sysc: Simplify cleanup upon failures in sysc_probe() (diff) | |
| download | linux-58e16d792a6a8c6b750f637a4649967fcac853dc.tar.xz linux-58e16d792a6a8c6b750f637a4649967fcac853dc.zip | |
Merge branch 'ti-sysc-fixes' into fixes
Diffstat (limited to 'arch/xtensa/kernel/setup.c')
| -rw-r--r-- | arch/xtensa/kernel/setup.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index c0ec24349421..5cb8a62e091c 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -310,7 +310,8 @@ extern char _SecondaryResetVector_text_start; extern char _SecondaryResetVector_text_end; #endif -static inline int mem_reserve(unsigned long start, unsigned long end) +static inline int __init_memblock mem_reserve(unsigned long start, + unsigned long end) { return memblock_reserve(start, end - start); } @@ -404,10 +405,6 @@ void __init setup_arch(char **cmdline_p) conswitchp = &dummy_con; # endif #endif - -#ifdef CONFIG_PCI - platform_pcibios_init(); -#endif } static DEFINE_PER_CPU(struct cpu, cpu_data); |