Skip to content

Commit cda2c65

Browse files
James HoganKAGA-KOKO
James Hogan
authored andcommitted
kbuild: Remove stale asm-generic wrappers
When a header file is removed from generic-y (often accompanied by the addition of an arch specific header), the generated wrapper file will persist, and in some cases may still take precedence over the new arch header. For example commit f1fe2d2 ("MIPS: Add definitions for extended context") removed ucontext.h from generic-y in arch/mips/include/asm/, and added an arch/mips/include/uapi/asm/ucontext.h. The continued use of the wrapper when reusing a dirty build tree resulted in build failures in arch/mips/kernel/signal.c: arch/mips/kernel/signal.c: In function ‘sc_to_extcontext’: arch/mips/kernel/signal.c:142:12: error: ‘struct ucontext’ has no member named ‘uc_extcontext’ return &uc->uc_extcontext; ^ Fix by detecting and removing wrapper headers in generated header directories that do not correspond to a filename in generic-y, genhdr-y, or the newly introduced generated-y. Reported-by: Jacek Anaszewski <[email protected]> Reported-by: Hauke Mehrtens <[email protected]> Reported-by: Heinrich Schuchardt <[email protected]> Signed-off-by: James Hogan <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Acked-by: Florian Fainelli <[email protected]> Cc: [email protected] Cc: [email protected] Cc: Paul Burton <[email protected]> Cc: [email protected] Cc: Ralf Baechle <[email protected]> Cc: Michal Marek <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Thomas Gleixner <[email protected]>
1 parent 54b880c commit cda2c65

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

scripts/Makefile.asm-generic

+16-1
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,26 @@ include scripts/Kbuild.include
1313
# Create output directory if not already present
1414
_dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))
1515

16+
# Stale wrappers when the corresponding files are removed from generic-y
17+
# need removing.
18+
generated-y := $(generic-y) $(genhdr-y) $(generated-y)
19+
all-files := $(patsubst %, $(obj)/%, $(generated-y))
20+
old-headers := $(wildcard $(obj)/*.h)
21+
unwanted := $(filter-out $(all-files),$(old-headers))
22+
1623
quiet_cmd_wrap = WRAP $@
1724
cmd_wrap = echo "\#include <asm-generic/$*.h>" >$@
1825

19-
all: $(patsubst %, $(obj)/%, $(generic-y))
26+
quiet_cmd_remove = REMOVE $(unwanted)
27+
cmd_remove = rm -f $(unwanted)
28+
29+
all: $(patsubst %, $(obj)/%, $(generic-y)) FORCE
30+
$(if $(unwanted),$(call cmd,remove),)
2031
@:
2132

2233
$(obj)/%.h:
2334
$(call cmd,wrap)
35+
36+
PHONY += FORCE
37+
.PHONY: $(PHONY)
38+
FORCE: ;

0 commit comments

Comments
 (0)