Skip to contentSkip to conversation

m68k: Switch to asm-generic/hardirq.h

PATCH In review Geert Uytterhoeven 2 participants 3 messages Jan 12, 2020 – Feb 10, 2020 m68k architecture

lore
Share & tools
lore

Geert Uytterhoeven

author maintainer
#0 lore raw

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

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.

---
 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
arch/m68k/include/asm/Kbuild +1 -0
index 591d53b763b71b27..63f12afc48749c96 100644
@@ -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
arch/m68k/include/asm/hardirq.h deleted +0 -29
deleted file mode 100644
index 11793165445df45a..0000000000000000
@@ -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
Signature · 1 line
2.17.1
Acked-by on v1 1/1
#1 lore raw

Hi Geert,

Quoted 5 lines · 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.

Looks good.

Regards
Greg

Quoted 54 lines
---
  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

arch/m68k/include/asm/Kbuild +1 -0
index 591d53b763b71b27..63f12afc48749c96 100644
@@ -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
arch/m68k/include/asm/hardirq.h deleted +0 -29
deleted file mode 100644
index 11793165445df45a..0000000000000000
@@ -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
author maintainer Applied
#2 lore raw
Quoted 10 lines · Greg Ungerer
Quoted 5 lines · 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.

Looks good.

Thanks, applied and queued for v5.7.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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