From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 20 May 2011 05:36:52 +0000 (+1000)
Subject: Merge remote branch 'origin/master' into merge
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=880102e78547c1db158a17e36cf0cdd98e7ad710;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge remote branch 'origin/master' into merge

Manual merge of arch/powerpc/kernel/smp.c and add missing scheduler_ipi()
call to arch/powerpc/platforms/cell/interrupt.c

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

880102e78547c1db158a17e36cf0cdd98e7ad710
diff --cc arch/powerpc/kernel/smp.c
index dd1973fed304,9f9c204bef69..4a6f2ec7e761
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@@ -178,66 -197,6 +178,66 @@@ int smp_request_message_ipi(int virq, i
  	return err;
  }
  
 +#ifdef CONFIG_PPC_SMP_MUXED_IPI
 +struct cpu_messages {
 +	int messages;			/* current messages */
 +	unsigned long data;		/* data for cause ipi */
 +};
 +static DEFINE_PER_CPU_SHARED_ALIGNED(struct cpu_messages, ipi_message);
 +
 +void smp_muxed_ipi_set_data(int cpu, unsigned long data)
 +{
 +	struct cpu_messages *info = &per_cpu(ipi_message, cpu);
 +
 +	info->data = data;
 +}
 +
 +void smp_muxed_ipi_message_pass(int cpu, int msg)
 +{
 +	struct cpu_messages *info = &per_cpu(ipi_message, cpu);
 +	char *message = (char *)&info->messages;
 +
 +	message[msg] = 1;
 +	mb();
 +	smp_ops->cause_ipi(cpu, info->data);
 +}
 +
 +void smp_muxed_ipi_resend(void)
 +{
 +	struct cpu_messages *info = &__get_cpu_var(ipi_message);
 +
 +	if (info->messages)
 +		smp_ops->cause_ipi(smp_processor_id(), info->data);
 +}
 +
 +irqreturn_t smp_ipi_demux(void)
 +{
 +	struct cpu_messages *info = &__get_cpu_var(ipi_message);
 +	unsigned int all;
 +
 +	mb();	/* order any irq clear */
 +
 +	do {
 +		all = xchg_local(&info->messages, 0);
 +
 +#ifdef __BIG_ENDIAN
 +		if (all & (1 << (24 - 8 * PPC_MSG_CALL_FUNCTION)))
 +			generic_smp_call_function_interrupt();
 +		if (all & (1 << (24 - 8 * PPC_MSG_RESCHEDULE)))
- 			reschedule_action(0, NULL); /* upcoming sched hook */
++			scheduler_ipi();
 +		if (all & (1 << (24 - 8 * PPC_MSG_CALL_FUNC_SINGLE)))
 +			generic_smp_call_function_single_interrupt();
 +		if (all & (1 << (24 - 8 * PPC_MSG_DEBUGGER_BREAK)))
 +			debug_ipi_action(0, NULL);
 +#else
 +#error Unsupported ENDIAN
 +#endif
 +	} while (info->messages);
 +
 +	return IRQ_HANDLED;
 +}
 +#endif /* CONFIG_PPC_SMP_MUXED_IPI */
 +
  void smp_send_reschedule(int cpu)
  {
  	if (likely(smp_ops))
diff --cc arch/powerpc/platforms/cell/interrupt.c
index 6a58744d66c3,44cfd1bef89b..449c08c15862
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@@ -196,20 -196,8 +196,20 @@@ static irqreturn_t iic_ipi_action(int i
  {
  	int ipi = (int)(long)dev_id;
  
 -	smp_message_recv(ipi);
 -
 +	switch(ipi) {
 +	case PPC_MSG_CALL_FUNCTION:
 +		generic_smp_call_function_interrupt();
 +		break;
 +	case PPC_MSG_RESCHEDULE:
- 		/* Upcoming sched hook */
++		scheduler_ipi();
 +		break;
 +	case PPC_MSG_CALL_FUNC_SINGLE:
 +		generic_smp_call_function_single_interrupt();
 +		break;
 +	case PPC_MSG_DEBUGGER_BREAK:
 +		debug_ipi_action(0, NULL);
 +		break;
 +	}
  	return IRQ_HANDLED;
  }
  static void iic_request_ipi(int ipi, const char *name)