From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- kernel/arch/mips/pmcs-msp71xx/msp_irq_cic.c | 3 ++- kernel/arch/mips/pmcs-msp71xx/msp_setup.c | 5 +++-- kernel/arch/mips/pmcs-msp71xx/msp_smp.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'kernel/arch/mips/pmcs-msp71xx') diff --git a/kernel/arch/mips/pmcs-msp71xx/msp_irq_cic.c b/kernel/arch/mips/pmcs-msp71xx/msp_irq_cic.c index 1207ec4df..8b9cf6463 100644 --- a/kernel/arch/mips/pmcs-msp71xx/msp_irq_cic.c +++ b/kernel/arch/mips/pmcs-msp71xx/msp_irq_cic.c @@ -88,7 +88,8 @@ static void unmask_cic_irq(struct irq_data *d) * Make sure we have IRQ affinity. It may have changed while * we were processing the IRQ. */ - if (!cpumask_test_cpu(smp_processor_id(), d->affinity)) + if (!cpumask_test_cpu(smp_processor_id(), + irq_data_get_affinity_mask(d))) return; #endif diff --git a/kernel/arch/mips/pmcs-msp71xx/msp_setup.c b/kernel/arch/mips/pmcs-msp71xx/msp_setup.c index 4f925e06c..9d293b3e9 100644 --- a/kernel/arch/mips/pmcs-msp71xx/msp_setup.c +++ b/kernel/arch/mips/pmcs-msp71xx/msp_setup.c @@ -10,6 +10,8 @@ * option) any later version. */ +#include + #include #include #include @@ -37,7 +39,6 @@ extern void msp_serial_setup(void); void msp7120_reset(void) { void *start, *end, *iptr; - register int i; /* Diasble all interrupts */ local_irq_disable(); @@ -77,7 +78,7 @@ void msp7120_reset(void) */ /* Wait a bit for the DDRC to settle */ - for (i = 0; i < 100000000; i++); + mdelay(125); #if defined(CONFIG_PMC_MSP7120_GW) /* diff --git a/kernel/arch/mips/pmcs-msp71xx/msp_smp.c b/kernel/arch/mips/pmcs-msp71xx/msp_smp.c index 10170580a..ffa0f7101 100644 --- a/kernel/arch/mips/pmcs-msp71xx/msp_smp.c +++ b/kernel/arch/mips/pmcs-msp71xx/msp_smp.c @@ -44,7 +44,7 @@ static irqreturn_t ipi_resched_interrupt(int irq, void *dev_id) static irqreturn_t ipi_call_interrupt(int irq, void *dev_id) { - smp_call_function_interrupt(); + generic_smp_call_function_interrupt(); return IRQ_HANDLED; } -- cgit 1.2.3-korg