mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-26 00:40:55 +07:00
Samsung drivers update for v3.15
- remove inclusion <asm/mach/time.h> from exynos_mct.c - remove inclusion <asm/mach/irq.h> from exynos-combiner.c and use calling handle_bad_irq() instead of do_bad_IRQ() -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJTE86zAAoJEA0Cl+kVi2xqL6cP/1X7FyP6LTMTvQg6wAQNANu2 rfoatvS4+vZnQxqQ58ISqiiW2Nh+CaZL3/nZd6m+yZu57lWsJjuyWj/rk/ejjEN1 k2VL0ZL/okvsIOf99t7HJBjleNT1Agxg6XaeycFUAR+JBUCOko9U63zhO/CER1e6 t74zY9WsputMdQSFCMgZqz61BBetkODdZsxtt+pH+YKRKiqK0PITjOmX3ZAlnohY 5GA/jbIb9LJKE7xGLpAGau0FIaLMX48WekcZe32bxHdAi4DQwzvcKgfh3wNlbs8L 50zTyono+AKQcbKXTFqu2lEx38S3mucJmyw4N5cz2aV1hjFZsv5Sg+U+zw93TJMp v6JXFML51lv6iooUMCPqpF0ErbUpWp+nG51CeNzfhwEWquYxe2j3FP3DxRpQsigV lT6Oxxun834Ug+RhD41mYs441P7JrZRksMkylgz+r/HmrHi1G6fdMVqj8JqjwFMO DKCuXRg3/nDl9O6IGwckEMuaWdCi8ZWmreAvy62GebPya8mSjlPlF61MFHhxsYCL cgBrN5oD4ouRALuovMqHzia1qcg+rLXLzEbEOa1dsclJGJm4tNuR/MWkeB7dWpez fNFIW+KintWkJVLEm+gg4Sc57Cm7BBwiKDl7IevzM+J8OjXClYbOAIUSwojQI8nn xWzF+s1LN9B66uVDP/yK =xBtv -----END PGP SIGNATURE----- Merge tag 'samsung-drivers' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup Samsung drivers update for v3.15 from Kukjin Kim: - remove inclusion <asm/mach/time.h> from exynos_mct.c - remove inclusion <asm/mach/irq.h> from exynos-combiner.c and use calling handle_bad_irq() instead of do_bad_IRQ() * tag 'samsung-drivers' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: irqchip: exynos-combiner: call handle_bad_irq directly clocksource: exynos_mct: remove unwanted header file inclusion Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
687fb3c8a0
@ -25,8 +25,6 @@
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/clocksource.h>
|
||||
|
||||
#include <asm/mach/time.h>
|
||||
|
||||
#define EXYNOS4_MCTREG(x) (x)
|
||||
#define EXYNOS4_MCT_G_CNT_L EXYNOS4_MCTREG(0x100)
|
||||
#define EXYNOS4_MCT_G_CNT_U EXYNOS4_MCTREG(0x104)
|
||||
|
@ -17,7 +17,6 @@
|
||||
#include <linux/irqchip/chained_irq.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/of_irq.h>
|
||||
#include <asm/mach/irq.h>
|
||||
|
||||
#include "irqchip.h"
|
||||
|
||||
@ -81,7 +80,7 @@ static void combiner_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
|
||||
cascade_irq = irq_find_mapping(combiner_irq_domain, combiner_irq);
|
||||
|
||||
if (unlikely(!cascade_irq))
|
||||
do_bad_IRQ(irq, desc);
|
||||
handle_bad_irq(irq, desc);
|
||||
else
|
||||
generic_handle_irq(cascade_irq);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user