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/entry.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/entry.S')
-rw-r--r-- | arch/s390/kernel/entry.S | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S index c8a2212014e0..6234c6978a1f 100644 --- a/arch/s390/kernel/entry.S +++ b/arch/s390/kernel/entry.S | |||
@@ -769,10 +769,13 @@ mcck_return: | |||
769 | 769 | ||
770 | RESTORE_ALL __LC_RETURN_MCCK_PSW,0 | 770 | RESTORE_ALL __LC_RETURN_MCCK_PSW,0 |
771 | 771 | ||
772 | #ifdef CONFIG_SMP | ||
773 | /* | 772 | /* |
774 | * Restart interruption handler, kick starter for additional CPUs | 773 | * Restart interruption handler, kick starter for additional CPUs |
775 | */ | 774 | */ |
775 | #ifdef CONFIG_SMP | ||
776 | #ifndef CONFIG_HOTPLUG_CPU | ||
777 | .section .init.text,"ax" | ||
778 | #endif | ||
776 | .globl restart_int_handler | 779 | .globl restart_int_handler |
777 | restart_int_handler: | 780 | restart_int_handler: |
778 | l %r15,__LC_SAVE_AREA+60 # load ksp | 781 | l %r15,__LC_SAVE_AREA+60 # load ksp |
@@ -785,6 +788,9 @@ restart_int_handler: | |||
785 | br %r14 # branch to start_secondary | 788 | br %r14 # branch to start_secondary |
786 | restart_addr: | 789 | restart_addr: |
787 | .long start_secondary | 790 | .long start_secondary |
791 | #ifndef CONFIG_HOTPLUG_CPU | ||
792 | .previous | ||
793 | #endif | ||
788 | #else | 794 | #else |
789 | /* | 795 | /* |
790 | * If we do not run with SMP enabled, let the new CPU crash ... | 796 | * If we do not run with SMP enabled, let the new CPU crash ... |