Commit 5ca9305e authored by Russell King's avatar Russell King

Merge flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-smp

into flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-rmk
parents 431f94fb a8af92ce
...@@ -314,14 +314,13 @@ static void ipi_cpu_stop(unsigned int cpu) ...@@ -314,14 +314,13 @@ static void ipi_cpu_stop(unsigned int cpu)
* *
* Bit 0 - Inter-processor function call * Bit 0 - Inter-processor function call
*/ */
void do_IPI(unsigned int ipimask, struct pt_regs *regs) void do_IPI(struct pt_regs *regs)
{ {
unsigned int cpu = smp_processor_id(); unsigned int cpu = smp_processor_id();
struct ipi_data *ipi = &per_cpu(ipi_data, cpu); struct ipi_data *ipi = &per_cpu(ipi_data, cpu);
ipi->ipi_count++; ipi->ipi_count++;
if (ipimask & (1 << 0)) {
for (;;) { for (;;) {
unsigned long msgs; unsigned long msgs;
...@@ -367,15 +366,6 @@ void do_IPI(unsigned int ipimask, struct pt_regs *regs) ...@@ -367,15 +366,6 @@ void do_IPI(unsigned int ipimask, struct pt_regs *regs)
} }
} while (msgs); } while (msgs);
} }
ipimask &= ~0x01;
}
if (ipimask) {
printk(KERN_CRIT "CPU %d: Unknown IPI signal %x!\n",
cpu, ipimask);
BUG();
}
} }
void smp_send_reschedule(int cpu) void smp_send_reschedule(int 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