Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08c33308 authored by James Bottomley's avatar James Bottomley Committed by Ingo Molnar
Browse files

x86/voyager: fix boot breakage caused by x86: boot secondary cpus through initial_code 



Impact: boot up secondary CPUs as well on x86/Voyager systems

This commit:

| commit 3e970473
| Author: Glauber Costa <gcosta@redhat.com>
| Date:   Wed May 28 13:01:54 2008 -0300
|
|     x86: boot secondary cpus through initial_code

removed the use of initialize_secondary.  However, it didn't update
voyager, so the secondary cpus no longer boot.  Fix this by adding the
initial_code switch to voyager as well.

Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Glauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c08b6acc

arch/x86/mach-voyager/voyager_smp.c

+4 −1
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ static void ack_vic_irq(unsigned int irq); 
static void vic_enable_cpi(void);

static void do_boot_cpu(__u8 cpuid);

static void do_quad_bootstrap(void);

static void initialize_secondary(void);



int hard_smp_processor_id(void);

int safe_smp_processor_id(void);
@@ -650,6 +651,8 @@ void __init smp_boot_cpus(void) 
	 smp_tune_scheduling();

	 */

	smp_store_cpu_info(boot_cpu_id);

	/* setup the jump vector */

	initial_code = (unsigned long)initialize_secondary;

	printk("CPU%d: ", boot_cpu_id);

	print_cpu_info(&cpu_data(boot_cpu_id));
@@ -702,7 +705,7 @@ void __init smp_boot_cpus(void) 


/* Reload the secondary CPUs task structure (this function does not

 * return ) */

void __init initialize_secondary(void)

static void __init initialize_secondary(void)

{

#if 0

	// AC kernels only