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 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/rusty/linux...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86
/
kernel
/
trampoline.c
diff --git
a/arch/x86/kernel/trampoline.c
b/arch/x86/kernel/trampoline.c
index 808031a5ba19a62bee01b404a812d57409b60b7d..699f7eeb896a15481e08130355c988c6e365190f 100644
(file)
--- a/
arch/x86/kernel/trampoline.c
+++ b/
arch/x86/kernel/trampoline.c
@@
-4,7
+4,7
@@
#include <asm/e820.h>
/* ready for x86_64 and x86 */
#include <asm/e820.h>
/* ready for x86_64 and x86 */
-unsigned char *trampoline_base = __va(TRAMPOLINE_BASE);
+unsigned char *
__cpuinitdata
trampoline_base = __va(TRAMPOLINE_BASE);
void __init reserve_trampoline_memory(void)
{
void __init reserve_trampoline_memory(void)
{
@@
-26,7
+26,7
@@
void __init reserve_trampoline_memory(void)
* bootstrap into the page concerned. The caller
* has made sure it's suitably aligned.
*/
* bootstrap into the page concerned. The caller
* has made sure it's suitably aligned.
*/
-unsigned long setup_trampoline(void)
+unsigned long
__cpuinit
setup_trampoline(void)
{
memcpy(trampoline_base, trampoline_data, TRAMPOLINE_SIZE);
return virt_to_phys(trampoline_base);
{
memcpy(trampoline_base, trampoline_data, TRAMPOLINE_SIZE);
return virt_to_phys(trampoline_base);