Commit e6e51fde authored by Anton Blanchard's avatar Anton Blanchard Committed by Linus Torvalds

[PATCH] ppc64: don't use state == SYSTEM_BOOTING

From: Nathan Lynch <nathanl@austin.ibm.com>

Fedora has a patch which introduces a new system state during boot.  Change
system_state == SYSTEM_BOOTING to system_state < SYSTEM_RUNNING to match
it.
Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d786b62a
...@@ -379,7 +379,7 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu) ...@@ -379,7 +379,7 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)
/* At boot time the cpus are already spinning in hold /* At boot time the cpus are already spinning in hold
* loops, so nothing to do. */ * loops, so nothing to do. */
if (system_state == SYSTEM_BOOTING) if (system_state < SYSTEM_RUNNING)
return 1; return 1;
pcpu = find_physical_cpu_to_start(get_hard_smp_processor_id(lcpu)); pcpu = find_physical_cpu_to_start(get_hard_smp_processor_id(lcpu));
...@@ -817,7 +817,7 @@ int __devinit __cpu_up(unsigned int cpu) ...@@ -817,7 +817,7 @@ int __devinit __cpu_up(unsigned int cpu)
int c; int c;
/* At boot, don't bother with non-present cpus -JSCHOPP */ /* At boot, don't bother with non-present cpus -JSCHOPP */
if (system_state == SYSTEM_BOOTING && !cpu_present(cpu)) if (system_state < SYSTEM_RUNNING && !cpu_present(cpu))
return -ENOENT; return -ENOENT;
paca[cpu].default_decr = tb_ticks_per_jiffy / decr_overclock; paca[cpu].default_decr = tb_ticks_per_jiffy / decr_overclock;
...@@ -849,7 +849,7 @@ int __devinit __cpu_up(unsigned int cpu) ...@@ -849,7 +849,7 @@ int __devinit __cpu_up(unsigned int cpu)
* use this value that I found through experimentation. * use this value that I found through experimentation.
* -- Cort * -- Cort
*/ */
if (system_state == SYSTEM_BOOTING) if (system_state < SYSTEM_RUNNING)
for (c = 5000; c && !cpu_callin_map[cpu]; c--) for (c = 5000; c && !cpu_callin_map[cpu]; c--)
udelay(100); udelay(100);
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment