[PATCH] m68k: Switch to asm-generic/hardirq.h

[PATCH] m68k: Switch to asm-generic/hardirq.h

[Geert Uytterhoeven]

Classic m68k with MMU was converted to generic hardirqs a long time ago,
and there are no longer include dependency issues preventing the direct
use of asm-generic/hardirq.h.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 arch/m68k/include/asm/Kbuild    |  1 +
 arch/m68k/include/asm/hardirq.h | 29 -----------------------------
 2 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 arch/m68k/include/asm/hardirq.h

diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 591d53b763b71b27..63f12afc48749c96 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -8,6 +8,7 @@ generic-y += emergency-restart.h
 generic-y += exec.h
 generic-y += extable.h
 generic-y += futex.h
+generic-y += hardirq.h
 generic-y += hw_irq.h
 generic-y += irq_regs.h
 generic-y += irq_work.h
diff --git a/arch/m68k/include/asm/hardirq.h b/arch/m68k/include/asm/hardirq.h
deleted file mode 100644
index 11793165445df45a..0000000000000000
--- a/arch/m68k/include/asm/hardirq.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __M68K_HARDIRQ_H
-#define __M68K_HARDIRQ_H
-
-#include <linux/threads.h>
-#include <linux/cache.h>
-#include <asm/irq.h>
-
-#ifdef CONFIG_MMU
-
-static inline void ack_bad_irq(unsigned int irq)
-{
-	pr_crit("unexpected IRQ trap at vector %02x\n", irq);
-}
-
-/* entry.S is sensitive to the offsets of these fields */
-typedef struct {
-	unsigned int __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */
-
-#else
-
-#include <asm-generic/hardirq.h>
-
-#endif /* !CONFIG_MMU */
-
-#endif
-- 
2.17.1

Re: [PATCH] m68k: Switch to asm-generic/hardirq.h

[Greg Ungerer]

Hi Geert,

On 13/1/20 3:48 am, Geert Uytterhoeven wrote:
> Classic m68k with MMU was converted to generic hardirqs a long time ago,
> and there are no longer include dependency issues preventing the direct
> use of asm-generic/hardirq.h.
> 
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

Looks good.

Acked-by: Greg Ungerer <gerg@linux-m68k.org>

Regards
Greg



> ---
>   arch/m68k/include/asm/Kbuild    |  1 +
>   arch/m68k/include/asm/hardirq.h | 29 -----------------------------
>   2 files changed, 1 insertion(+), 29 deletions(-)
>   delete mode 100644 arch/m68k/include/asm/hardirq.h
> 
> diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
> index 591d53b763b71b27..63f12afc48749c96 100644
> --- a/arch/m68k/include/asm/Kbuild
> +++ b/arch/m68k/include/asm/Kbuild
> @@ -8,6 +8,7 @@ generic-y += emergency-restart.h
>   generic-y += exec.h
>   generic-y += extable.h
>   generic-y += futex.h
> +generic-y += hardirq.h
>   generic-y += hw_irq.h
>   generic-y += irq_regs.h
>   generic-y += irq_work.h
> diff --git a/arch/m68k/include/asm/hardirq.h b/arch/m68k/include/asm/hardirq.h
> deleted file mode 100644
> index 11793165445df45a..0000000000000000
> --- a/arch/m68k/include/asm/hardirq.h
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> -#ifndef __M68K_HARDIRQ_H
> -#define __M68K_HARDIRQ_H
> -
> -#include <linux/threads.h>
> -#include <linux/cache.h>
> -#include <asm/irq.h>
> -
> -#ifdef CONFIG_MMU
> -
> -static inline void ack_bad_irq(unsigned int irq)
> -{
> -	pr_crit("unexpected IRQ trap at vector %02x\n", irq);
> -}
> -
> -/* entry.S is sensitive to the offsets of these fields */
> -typedef struct {
> -	unsigned int __softirq_pending;
> -} ____cacheline_aligned irq_cpustat_t;
> -
> -#include <linux/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */
> -
> -#else
> -
> -#include <asm-generic/hardirq.h>
> -
> -#endif /* !CONFIG_MMU */
> -
> -#endif
> 

Re: [PATCH] m68k: Switch to asm-generic/hardirq.h

[Geert Uytterhoeven]

On Mon, Jan 13, 2020 at 2:59 AM Greg Ungerer <gerg@linux-m68k.org> wrote:
> On 13/1/20 3:48 am, Geert Uytterhoeven wrote:
> > Classic m68k with MMU was converted to generic hardirqs a long time ago,
> > and there are no longer include dependency issues preventing the direct
> > use of asm-generic/hardirq.h.
> >
> > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
>
> Looks good.
>
> Acked-by: Greg Ungerer <gerg@linux-m68k.org>

Thanks, applied and queued for v5.7.

Gr{oetje,eeting}s,

                        Geert


--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds