The patch titled Fix 'make headers_check' on biarch architectures has been removed from the -mm tree. Its filename is fix-make-headers_check-on-biarch-architectures-for.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: Fix 'make headers_check' on biarch architectures From: David Woodhouse <dwmw2@xxxxxxxxxxxxx> We generate an <asm/foo.h> which includes either <asm-$ARCH/foo.h> or <asm-$ALTARCH/foo.h> as appropriate. But we were doing this dependent on whether the file in question existed in the _unexported_ tree, not the exported tree. So if a file was exported to userspace in one asm- directory but not the other, the generated file in asm/ was incorrect. This only changed the failure mode if it _was_ included from a nice #error to a less explicable #include failure -- but it also gave false errors in 'make headers_check' output. Fix it by looking in the right place instead. Signed-off-by: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Cc: Sam Ravnborg <sam@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- scripts/Makefile.headersinst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff -puN scripts/Makefile.headersinst~fix-make-headers_check-on-biarch-architectures-for scripts/Makefile.headersinst --- a/scripts/Makefile.headersinst~fix-make-headers_check-on-biarch-architectures-for +++ a/scripts/Makefile.headersinst @@ -93,14 +93,14 @@ STUBDEF=__ASM_STUB_`echo $@ | tr a-z. A- echo "\#ifndef $$STUBDEF" ; \ echo "\#define $$STUBDEF" ; \ echo "\# if $(ARCHDEF)" ; \ -if [ -r $(srctree)/include/$(archasm)/$@ ]; then \ +if [ -r $(INSTALL_HDR_PATH)/include/$(archasm)/$@ ]; then \ echo "\# include <$(archasm)/$@>" ; \ else \ echo "\# error $(archasm)/$@ does not exist in" \ "the $(ARCH) architecture" ; \ fi ; \ echo "\# elif $(ALTARCHDEF)" ; \ -if [ -r $(srctree)/include/$(altarchasm)/$@ ]; then \ +if [ -r $(INSTALL_HDR_PATH)/include/$(altarchasm)/$@ ]; then \ echo "\# include <$(altarchasm)/$@>" ; \ else \ echo "\# error $(altarchasm)/$@ does not exist in" \ @@ -149,7 +149,9 @@ endif hdrinst := -rR -f $(srctree)/scripts/Makefile.headersinst obj .PHONY: altarch-dir -altarch-dir: +# All the files in the normal arch dir must be created first, since we test +# for their existence. +altarch-dir: $(subdir-y) $(header-y) $(unifdef-y) $(objhdr-y) $(Q)$(MAKE) $(hdrinst)=include/asm-$(ALTARCH) dst=include/asm-$(ALTARCH) $(Q)$(MAKE) $(hdrinst)=include/asm dst=include/asm _ Patches currently in -mm which might be from dwmw2@xxxxxxxxxxxxx are origin.patch add-headers_check-target-to-output-of-make-help.patch fix-make-headers_check-on-m68k.patch headers_check-clean-up-asm-parisc-pageh-for-user-headers.patch git-gfs2.patch git-mtd.patch mtd-maps-ixp4xx-partition-parsing.patch fix-the-unlock-addr-lookup-bug-in-mtd-jedec-probe.patch mtd-printk-format-warning.patch fs-jffs2-jffs2_fs_ih-removal-of-old-code.patch drivers-mtd-nand-au1550ndc-removal-of-old-code.patch git-parisc.patch pci-quirks-update.patch avr32-mtd-static-memory-controller-driver-try-2.patch avr32-mtd-unlock-flash-if-necessary-try-2.patch avr32-mtd-at49bv6416-platform-device-for-atstk1000.patch avr32-mtd-unlock-flash-if-necessary.patch split-i386-and-x86_64-ptraceh.patch split-i386-and-x86_64-ptraceh-fix.patch make-uml-use-ptrace-abih.patch fs-conversions-from-kmallocmemset-to-kzcalloc.patch add-config_headers_check-option-to-automatically-run-make-headers_check.patch pci-mtd-switch-to-pci_get_device-and-do-ref-counting.patch the-scheduled-removal-of-some-oss-drivers-fix-fix.patch debug-shared-irqs.patch debug-shared-irqs-kconfig-fix.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html