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/arm/mach-iop13xx/include/mach/time.h | 2 +- kernel/arch/arm/mach-iop13xx/irq.c | 2 +- kernel/arch/arm/mach-iop13xx/msi.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'kernel/arch/arm/mach-iop13xx') diff --git a/kernel/arch/arm/mach-iop13xx/include/mach/time.h b/kernel/arch/arm/mach-iop13xx/include/mach/time.h index 15bc9bb78..c871e6874 100644 --- a/kernel/arch/arm/mach-iop13xx/include/mach/time.h +++ b/kernel/arch/arm/mach-iop13xx/include/mach/time.h @@ -42,7 +42,7 @@ static inline unsigned long iop13xx_core_freq(void) case IOP13XX_CORE_FREQ_1200: return 1200000000; default: - printk("%s: warning unknown frequency, defaulting to 800Mhz\n", + printk("%s: warning unknown frequency, defaulting to 800MHz\n", __func__); } diff --git a/kernel/arch/arm/mach-iop13xx/irq.c b/kernel/arch/arm/mach-iop13xx/irq.c index bc739701c..623d85a4a 100644 --- a/kernel/arch/arm/mach-iop13xx/irq.c +++ b/kernel/arch/arm/mach-iop13xx/irq.c @@ -233,7 +233,7 @@ void __init iop13xx_init_irq(void) irq_set_chip(i, &iop13xx_irqchip4); irq_set_handler(i, handle_level_irq); - set_irq_flags(i, IRQF_VALID | IRQF_PROBE); + irq_clear_status_flags(i, IRQ_NOREQUEST | IRQ_NOPROBE); } iop13xx_msi_init(); diff --git a/kernel/arch/arm/mach-iop13xx/msi.c b/kernel/arch/arm/mach-iop13xx/msi.c index 9f89e76df..f6235b285 100644 --- a/kernel/arch/arm/mach-iop13xx/msi.c +++ b/kernel/arch/arm/mach-iop13xx/msi.c @@ -91,7 +91,7 @@ static void (*write_imipr[])(u32) = { write_imipr_3, }; -static void iop13xx_msi_handler(unsigned int irq, struct irq_desc *desc) +static void iop13xx_msi_handler(struct irq_desc *desc) { int i, j; unsigned long status; -- cgit 1.2.3-korg