projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pm-sleep'
[firefly-linux-kernel-4.4.55.git]
/
arch
/
xtensa
/
kernel
/
setup.c
diff --git
a/arch/xtensa/kernel/setup.c
b/arch/xtensa/kernel/setup.c
index 28fc57ef5b8664cae500185ae705845234cd9b8a..9735691f37f164803ee0a971c3c14c8214b13e69 100644
(file)
--- a/
arch/xtensa/kernel/setup.c
+++ b/
arch/xtensa/kernel/setup.c
@@
-190,7
+190,7
@@
static int __init parse_bootparam(const bp_tag_t* tag)
#ifdef CONFIG_OF
bool __initdata dt_memory_scan = false;
#ifdef CONFIG_OF
bool __initdata dt_memory_scan = false;
-#if
XCHAL_HAVE_PTP_MMU &&
XCHAL_HAVE_SPANNING_WAY
+#if
!XCHAL_HAVE_PTP_MMU ||
XCHAL_HAVE_SPANNING_WAY
unsigned long xtensa_kio_paddr = XCHAL_KIO_DEFAULT_PADDR;
EXPORT_SYMBOL(xtensa_kio_paddr);
unsigned long xtensa_kio_paddr = XCHAL_KIO_DEFAULT_PADDR;
EXPORT_SYMBOL(xtensa_kio_paddr);
@@
-334,7
+334,10
@@
extern char _Level5InterruptVector_text_end;
extern char _Level6InterruptVector_text_start;
extern char _Level6InterruptVector_text_end;
#endif
extern char _Level6InterruptVector_text_start;
extern char _Level6InterruptVector_text_end;
#endif
-
+#ifdef CONFIG_SMP
+extern char _SecondaryResetVector_text_start;
+extern char _SecondaryResetVector_text_end;
+#endif
#ifdef CONFIG_S32C1I_SELFTEST
#ifdef CONFIG_S32C1I_SELFTEST
@@
-506,6
+509,10
@@
void __init setup_arch(char **cmdline_p)
__pa(&_Level6InterruptVector_text_end), 0);
#endif
__pa(&_Level6InterruptVector_text_end), 0);
#endif
+#ifdef CONFIG_SMP
+ mem_reserve(__pa(&_SecondaryResetVector_text_start),
+ __pa(&_SecondaryResetVector_text_end), 0);
+#endif
parse_early_param();
bootmem_init();
parse_early_param();
bootmem_init();