Skip to contentSkip to conversation

m68k: Drop redundant generic-y += hardirq.h

PATCH Applied Geert Uytterhoeven 2 participants 2 messages Apr 13, 2020 m68k architecture

lore
Share & tools
lore

Geert Uytterhoeven

author maintainer
#0 lore raw

PATCH 1/1 m68k: Drop redundant generic-y += hardirq.h

The cleanup in commit 630f289b7114c0e6 ("asm-generic: make more kernel-space headers mandatory") did not take into account the recently added line for hardirq.h in commit acc45648b9aefa90 ("m68k: Switch to asm-generic/hardirq.h"), leading to the following message during the build:

scripts/Makefile.asm-generic:25: redundant generic-y found in arch/m68k/include/asm/Kbuild: hardirq.h

Fix this by dropping the now redundant line.

Fixes 630f289b7114c0e6 ("asm-generic: make more kernel-space headers mandatory")

---
Feel free to take this one directly, as I have no other m68k fixes queued for v5.7 yet.

 arch/m68k/include/asm/Kbuild | 1 -
 1 file changed, 1 deletion(-)
arch/m68k/include/asm/Kbuild +0 -1
index a0765aa60ea9aa8d..1bff55aa2d54e2ce 100644
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 generated-y += syscall_table.h
 generic-y += extable.h
-generic-y += hardirq.h
 generic-y += kvm_para.h
 generic-y += local64.h
 generic-y += mcs_spinlock.h
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Geert Uytterhoeven

The cleanup in commit 630f289b7114c0e6 ("asm-generic: make more kernel-space headers mandatory") did not take into account the recently added line for hardirq.h in commit acc45648b9aefa90 ("m68k: Switch to asm-generic/hardirq.h"), leading to the following message during the build:

Quoted 6 lines

scripts/Makefile.asm-generic:25: redundant generic-y found in arch/m68k/include/asm/Kbuild: hardirq.h

Fix this by dropping the now redundant line.

Fixes 630f289b7114c0e6 ("asm-generic: make more kernel-space headers mandatory")
Quoted 22 lines

---
Feel free to take this one directly, as I have no other m68k fixes queued for v5.7 yet.

 arch/m68k/include/asm/Kbuild | 1 -
 1 file changed, 1 deletion(-)
arch/m68k/include/asm/Kbuild +0 -2
index a0765aa60ea9aa8d..1bff55aa2d54e2ce 100644
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 generated-y += syscall_table.h
 generic-y += extable.h
-generic-y += hardirq.h
 generic-y += kvm_para.h
 generic-y += local64.h
 generic-y += mcs_spinlock.h
--

2.17.1

Signature · 2 lines
Best Regards
Masahiro Yamada