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-highlander/psw.c | 2 +- kernel/arch/sh/boards/mach-landisk/psw.c | 2 +- kernel/arch/sh/boards/mach-rsk/setup.c | 3 --- 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 ++- kernel/arch/sh/boards/mach-x3proto/gpio.c | 4 ++-- 7 files changed, 10 insertions(+), 12 deletions(-) (limited to 'kernel/arch/sh/boards') diff --git a/kernel/arch/sh/boards/mach-highlander/psw.c b/kernel/arch/sh/boards/mach-highlander/psw.c index 522786318..40e2b585d 100644 --- a/kernel/arch/sh/boards/mach-highlander/psw.c +++ b/kernel/arch/sh/boards/mach-highlander/psw.c @@ -10,7 +10,7 @@ * for more details. */ #include -#include +#include #include #include #include diff --git a/kernel/arch/sh/boards/mach-landisk/psw.c b/kernel/arch/sh/boards/mach-landisk/psw.c index bef83522f..5192b1f43 100644 --- a/kernel/arch/sh/boards/mach-landisk/psw.c +++ b/kernel/arch/sh/boards/mach-landisk/psw.c @@ -140,4 +140,4 @@ static int __init psw_init(void) { return platform_add_devices(psw_devices, ARRAY_SIZE(psw_devices)); } -module_init(psw_init); +device_initcall(psw_init); diff --git a/kernel/arch/sh/boards/mach-rsk/setup.c b/kernel/arch/sh/boards/mach-rsk/setup.c index 2685ea03b..6bc134bd7 100644 --- a/kernel/arch/sh/boards/mach-rsk/setup.c +++ b/kernel/arch/sh/boards/mach-rsk/setup.c @@ -27,8 +27,6 @@ static struct regulator_consumer_supply dummy_supplies[] = { REGULATOR_SUPPLY("vdd33a", "smsc911x"), }; -static const char *part_probes[] = { "cmdlinepart", NULL }; - static struct mtd_partition rsk_partitions[] = { { .name = "Bootloader", @@ -50,7 +48,6 @@ static struct physmap_flash_data flash_data = { .parts = rsk_partitions, .nr_parts = ARRAY_SIZE(rsk_partitions), .width = 2, - .part_probe_types = part_probes, }; static struct resource flash_resource = { 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; diff --git a/kernel/arch/sh/boards/mach-x3proto/gpio.c b/kernel/arch/sh/boards/mach-x3proto/gpio.c index f035a7ac6..1fb2cbee2 100644 --- a/kernel/arch/sh/boards/mach-x3proto/gpio.c +++ b/kernel/arch/sh/boards/mach-x3proto/gpio.c @@ -60,9 +60,9 @@ static int x3proto_gpio_to_irq(struct gpio_chip *chip, unsigned gpio) return virq; } -static void x3proto_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) +static void x3proto_gpio_irq_handler(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 pin; -- cgit 1.2.3-korg