diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2007-06-19 07:10:03 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2007-06-19 07:10:19 -0400 |
commit | 84b36a8e0c863aeea29b62f8411157192481dd2e (patch) | |
tree | 5b5d6e4a9eb766f9f58746f47a8ad870df9cd747 /arch/s390/kernel/entry64.S | |
parent | ce4448238aee0144a2458874944df5a5a01a6ac6 (diff) |
[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>
Diffstat (limited to 'arch/s390/kernel/entry64.S')
-rw-r--r-- | arch/s390/kernel/entry64.S | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S index 93745fd8f555..685f11faa4bc 100644 --- a/arch/s390/kernel/entry64.S +++ b/arch/s390/kernel/entry64.S | |||
@@ -745,10 +745,13 @@ mcck_return: | |||
745 | #endif | 745 | #endif |
746 | lpswe __LC_RETURN_MCCK_PSW # back to caller | 746 | lpswe __LC_RETURN_MCCK_PSW # back to caller |
747 | 747 | ||
748 | #ifdef CONFIG_SMP | ||
749 | /* | 748 | /* |
750 | * Restart interruption handler, kick starter for additional CPUs | 749 | * Restart interruption handler, kick starter for additional CPUs |
751 | */ | 750 | */ |
751 | #ifdef CONFIG_SMP | ||
752 | #ifndef CONFIG_HOTPLUG_CPU | ||
753 | .section .init.text,"ax" | ||
754 | #endif | ||
752 | .globl restart_int_handler | 755 | .globl restart_int_handler |
753 | restart_int_handler: | 756 | restart_int_handler: |
754 | lg %r15,__LC_SAVE_AREA+120 # load ksp | 757 | lg %r15,__LC_SAVE_AREA+120 # load ksp |
@@ -759,6 +762,9 @@ restart_int_handler: | |||
759 | lmg %r6,%r15,__SF_GPRS(%r15) # load registers from clone | 762 | lmg %r6,%r15,__SF_GPRS(%r15) # load registers from clone |
760 | stosm __SF_EMPTY(%r15),0x04 # now we can turn dat on | 763 | stosm __SF_EMPTY(%r15),0x04 # now we can turn dat on |
761 | jg start_secondary | 764 | jg start_secondary |
765 | #ifndef CONFIG_HOTPLUG_CPU | ||
766 | .previous | ||
767 | #endif | ||
762 | #else | 768 | #else |
763 | /* | 769 | /* |
764 | * If we do not run with SMP enabled, let the new CPU crash ... | 770 | * If we do not run with SMP enabled, let the new CPU crash ... |