[S390] Fix yet another two section mismatches.
WARNING: arch/s390/kernel/built-in.o(.text+0xb92a): Section mismatch: reference to .init.text:start_secondary (between 'restart_addr' and 'stack_overflow') WARNING: arch/s390/appldata/built-in.o(.data+0xdc): Section mismatch: reference to .init.text: (between 'appldata_nb' and 'appldata_timer_lock') Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
parent
ce4448238a
commit
84b36a8e0c
|
@ -535,8 +535,7 @@ void appldata_unregister_ops(struct appldata_ops *ops)
|
||||||
|
|
||||||
/******************************* init / exit *********************************/
|
/******************************* init / exit *********************************/
|
||||||
|
|
||||||
static void
|
static void __cpuinit appldata_online_cpu(int cpu)
|
||||||
appldata_online_cpu(int cpu)
|
|
||||||
{
|
{
|
||||||
init_virt_timer(&per_cpu(appldata_timer, cpu));
|
init_virt_timer(&per_cpu(appldata_timer, cpu));
|
||||||
per_cpu(appldata_timer, cpu).function = appldata_timer_function;
|
per_cpu(appldata_timer, cpu).function = appldata_timer_function;
|
||||||
|
@ -580,7 +579,7 @@ appldata_cpu_notify(struct notifier_block *self,
|
||||||
return NOTIFY_OK;
|
return NOTIFY_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct notifier_block appldata_nb = {
|
static struct notifier_block __cpuinitdata appldata_nb = {
|
||||||
.notifier_call = appldata_cpu_notify,
|
.notifier_call = appldata_cpu_notify,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -769,10 +769,13 @@ mcck_return:
|
||||||
|
|
||||||
RESTORE_ALL __LC_RETURN_MCCK_PSW,0
|
RESTORE_ALL __LC_RETURN_MCCK_PSW,0
|
||||||
|
|
||||||
#ifdef CONFIG_SMP
|
|
||||||
/*
|
/*
|
||||||
* Restart interruption handler, kick starter for additional CPUs
|
* Restart interruption handler, kick starter for additional CPUs
|
||||||
*/
|
*/
|
||||||
|
#ifdef CONFIG_SMP
|
||||||
|
#ifndef CONFIG_HOTPLUG_CPU
|
||||||
|
.section .init.text,"ax"
|
||||||
|
#endif
|
||||||
.globl restart_int_handler
|
.globl restart_int_handler
|
||||||
restart_int_handler:
|
restart_int_handler:
|
||||||
l %r15,__LC_SAVE_AREA+60 # load ksp
|
l %r15,__LC_SAVE_AREA+60 # load ksp
|
||||||
|
@ -785,6 +788,9 @@ restart_int_handler:
|
||||||
br %r14 # branch to start_secondary
|
br %r14 # branch to start_secondary
|
||||||
restart_addr:
|
restart_addr:
|
||||||
.long start_secondary
|
.long start_secondary
|
||||||
|
#ifndef CONFIG_HOTPLUG_CPU
|
||||||
|
.previous
|
||||||
|
#endif
|
||||||
#else
|
#else
|
||||||
/*
|
/*
|
||||||
* If we do not run with SMP enabled, let the new CPU crash ...
|
* If we do not run with SMP enabled, let the new CPU crash ...
|
||||||
|
|
|
@ -745,10 +745,13 @@ mcck_return:
|
||||||
#endif
|
#endif
|
||||||
lpswe __LC_RETURN_MCCK_PSW # back to caller
|
lpswe __LC_RETURN_MCCK_PSW # back to caller
|
||||||
|
|
||||||
#ifdef CONFIG_SMP
|
|
||||||
/*
|
/*
|
||||||
* Restart interruption handler, kick starter for additional CPUs
|
* Restart interruption handler, kick starter for additional CPUs
|
||||||
*/
|
*/
|
||||||
|
#ifdef CONFIG_SMP
|
||||||
|
#ifndef CONFIG_HOTPLUG_CPU
|
||||||
|
.section .init.text,"ax"
|
||||||
|
#endif
|
||||||
.globl restart_int_handler
|
.globl restart_int_handler
|
||||||
restart_int_handler:
|
restart_int_handler:
|
||||||
lg %r15,__LC_SAVE_AREA+120 # load ksp
|
lg %r15,__LC_SAVE_AREA+120 # load ksp
|
||||||
|
@ -759,6 +762,9 @@ restart_int_handler:
|
||||||
lmg %r6,%r15,__SF_GPRS(%r15) # load registers from clone
|
lmg %r6,%r15,__SF_GPRS(%r15) # load registers from clone
|
||||||
stosm __SF_EMPTY(%r15),0x04 # now we can turn dat on
|
stosm __SF_EMPTY(%r15),0x04 # now we can turn dat on
|
||||||
jg start_secondary
|
jg start_secondary
|
||||||
|
#ifndef CONFIG_HOTPLUG_CPU
|
||||||
|
.previous
|
||||||
|
#endif
|
||||||
#else
|
#else
|
||||||
/*
|
/*
|
||||||
* If we do not run with SMP enabled, let the new CPU crash ...
|
* If we do not run with SMP enabled, let the new CPU crash ...
|
||||||
|
|
Loading…
Reference in a new issue