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

Commit c3895b01 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-ingo into cpus4096
parents 3c68b4a8 968ea6d8

arch/alpha/include/asm/smp.h

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ extern struct cpuinfo_alpha cpu_data[NR_CPUS]; 
#define raw_smp_processor_id()	(current_thread_info()->cpu)



extern int smp_num_cpus;

#define cpu_possible_map	cpu_present_map



extern void arch_send_call_function_single_ipi(int cpu);

extern void arch_send_call_function_ipi(cpumask_t mask);

arch/alpha/kernel/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ int irq_select_affinity(unsigned int irq) 
	last_cpu = cpu;



	irq_desc[irq].affinity = cpumask_of_cpu(cpu);

	irq_desc[irq].chip->set_affinity(irq, cpumask_of_cpu(cpu));

	irq_desc[irq].chip->set_affinity(irq, cpumask_of(cpu));

	return 0;

}

#endif /* CONFIG_SMP */

arch/alpha/kernel/process.c

+2 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ common_shutdown_1(void *generic_ptr) 
		flags |= 0x00040000UL; /* "remain halted" */

		*pflags = flags;

		cpu_clear(cpuid, cpu_present_map);

		cpu_clear(cpuid, cpu_possible_map);

		halt();

	}

#endif
@@ -120,6 +121,7 @@ common_shutdown_1(void *generic_ptr) 
#ifdef CONFIG_SMP

	/* Wait for the secondaries to halt. */

	cpu_clear(boot_cpuid, cpu_present_map);

	cpu_clear(boot_cpuid, cpu_possible_map);

	while (cpus_weight(cpu_present_map))

		barrier();

#endif

arch/alpha/kernel/smp.c

+2 −5
Original line number Diff line number Diff line
@@ -70,11 +70,6 @@ enum ipi_message_type { 
/* Set to a secondary's cpuid when it comes online.  */

static int smp_secondary_alive __devinitdata = 0;



/* Which cpus ids came online.  */

cpumask_t cpu_online_map;



EXPORT_SYMBOL(cpu_online_map);



int smp_num_probed;		/* Internal processor count */

int smp_num_cpus = 1;		/* Number that came online.  */

EXPORT_SYMBOL(smp_num_cpus);
@@ -440,6 +435,7 @@ setup_smp(void) 
				((char *)cpubase + i*hwrpb->processor_size);

			if ((cpu->flags & 0x1cc) == 0x1cc) {

				smp_num_probed++;

				cpu_set(i, cpu_possible_map);

				cpu_set(i, cpu_present_map);

				cpu->pal_revision = boot_cpu_palrev;

			}
@@ -473,6 +469,7 @@ smp_prepare_cpus(unsigned int max_cpus) 


	/* Nothing to do on a UP box, or when told not to.  */

	if (smp_num_probed == 1 || max_cpus == 0) {

		cpu_possible_map = cpumask_of_cpu(boot_cpuid);

		cpu_present_map = cpumask_of_cpu(boot_cpuid);

		printk(KERN_INFO "SMP mode deactivated.\n");

		return;

arch/alpha/kernel/sys_dp264.c

+4 −4
Original line number Diff line number Diff line
@@ -177,19 +177,19 @@ cpu_set_irq_affinity(unsigned int irq, cpumask_t affinity) 
}



static void

dp264_set_affinity(unsigned int irq, cpumask_t affinity)

dp264_set_affinity(unsigned int irq, const struct cpumask *affinity)

{ 

	spin_lock(&dp264_irq_lock);

	cpu_set_irq_affinity(irq, affinity);

	cpu_set_irq_affinity(irq, *affinity);

	tsunami_update_irq_hw(cached_irq_mask);

	spin_unlock(&dp264_irq_lock);

}



static void

clipper_set_affinity(unsigned int irq, cpumask_t affinity)

clipper_set_affinity(unsigned int irq, const struct cpumask *affinity)

{ 

	spin_lock(&dp264_irq_lock);

	cpu_set_irq_affinity(irq - 16, affinity);

	cpu_set_irq_affinity(irq - 16, *affinity);

	tsunami_update_irq_hw(cached_irq_mask);

	spin_unlock(&dp264_irq_lock);

}