diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2010-01-13 14:44:34 -0500 |
---|---|---|
committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2010-01-13 14:44:45 -0500 |
commit | 02beaccc901b7a28ac1de79f3ed122f5fda220b1 (patch) | |
tree | 77c36cd14b9ce1324ff6127a4bdb19e312fef7e2 /arch/s390 | |
parent | a58c26bba9ebe97fea99aee125728b1f3886499e (diff) |
[S390] smp: setup smp_processor_id early
smp_processor_id() is supposed to work before setup_arch() gets called.
Before that smp_processor_id() may return just an arbitrary value that
is contained in the uninitialized boot lowcore.
So provide the arch function which will override the weak function in
init/main.c.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/kernel/setup.c | 1 | ||||
-rw-r--r-- | arch/s390/kernel/smp.c | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 2148ad3d490d..2d6a265b0145 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c | |||
@@ -849,7 +849,6 @@ setup_arch(char **cmdline_p) | |||
849 | setup_lowcore(); | 849 | setup_lowcore(); |
850 | 850 | ||
851 | cpu_init(); | 851 | cpu_init(); |
852 | __cpu_logical_map[0] = stap(); | ||
853 | s390_init_cpu_topology(); | 852 | s390_init_cpu_topology(); |
854 | 853 | ||
855 | /* | 854 | /* |
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index 93e52039321b..eebce7fdc97c 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c | |||
@@ -717,6 +717,12 @@ void __init smp_cpus_done(unsigned int max_cpus) | |||
717 | { | 717 | { |
718 | } | 718 | } |
719 | 719 | ||
720 | void __init smp_setup_processor_id(void) | ||
721 | { | ||
722 | S390_lowcore.cpu_nr = 0; | ||
723 | __cpu_logical_map[0] = stap(); | ||
724 | } | ||
725 | |||
720 | /* | 726 | /* |
721 | * the frequency of the profiling timer can be changed | 727 | * the frequency of the profiling timer can be changed |
722 | * by writing a multiplier value into /proc/profile. | 728 | * by writing a multiplier value into /proc/profile. |