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/sh/boards/mach-se/7343/irq.c | 4 ++-- kernel/arch/sh/boards/mach-se/7722/irq.c | 4 ++-- kernel/arch/sh/boards/mach-se/7724/irq.c | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'kernel/arch/sh/boards/mach-se') diff --git a/kernel/arch/sh/boards/mach-se/7343/irq.c b/kernel/arch/sh/boards/mach-se/7343/irq.c index 1087dba9b..6129aef6d 100644 --- a/kernel/arch/sh/boards/mach-se/7343/irq.c +++ b/kernel/arch/sh/boards/mach-se/7343/irq.c @@ -29,9 +29,9 @@ static void __iomem *se7343_irq_regs; struct irq_domain *se7343_irq_domain; -static void se7343_irq_demux(unsigned int irq, struct irq_desc *desc) +static void se7343_irq_demux(struct irq_desc *desc) { - struct irq_data *data = irq_get_irq_data(irq); + struct irq_data *data = irq_desc_get_irq_data(desc); struct irq_chip *chip = irq_data_get_irq_chip(data); unsigned long mask; int bit; diff --git a/kernel/arch/sh/boards/mach-se/7722/irq.c b/kernel/arch/sh/boards/mach-se/7722/irq.c index 00e699232..24c74a882 100644 --- a/kernel/arch/sh/boards/mach-se/7722/irq.c +++ b/kernel/arch/sh/boards/mach-se/7722/irq.c @@ -28,9 +28,9 @@ static void __iomem *se7722_irq_regs; struct irq_domain *se7722_irq_domain; -static void se7722_irq_demux(unsigned int irq, struct irq_desc *desc) +static void se7722_irq_demux(struct irq_desc *desc) { - struct irq_data *data = irq_get_irq_data(irq); + struct irq_data *data = irq_desc_get_irq_data(desc); struct irq_chip *chip = irq_data_get_irq_chip(data); unsigned long mask; int bit; diff --git a/kernel/arch/sh/boards/mach-se/7724/irq.c b/kernel/arch/sh/boards/mach-se/7724/irq.c index 5d1d3ec9a..64e681e66 100644 --- a/kernel/arch/sh/boards/mach-se/7724/irq.c +++ b/kernel/arch/sh/boards/mach-se/7724/irq.c @@ -92,8 +92,9 @@ static struct irq_chip se7724_irq_chip __read_mostly = { .irq_unmask = enable_se7724_irq, }; -static void se7724_irq_demux(unsigned int irq, struct irq_desc *desc) +static void se7724_irq_demux(struct irq_desc *desc) { + unsigned int irq = irq_desc_get_irq(desc); struct fpga_irq set = get_fpga_irq(irq); unsigned short intv = __raw_readw(set.sraddr); unsigned int ext_irq = set.base; -- cgit 1.2.3-korg