From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 24 Sep 2006 21:55:52 +0000 (-0700)
Subject: Merge git://git.infradead.org/~dwmw2/khdrs-2.6
X-Git-Tag: v2.6.19-rc1~1260
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=398477d4bd57cc33792fd93035c2763ad78629c4;p=linux-2.6-omap-h63xx.git

Merge git://git.infradead.org/~dwmw2/khdrs-2.6

* git://git.infradead.org/~dwmw2/khdrs-2.6:
  New 'make headers_install_all' target.
  Use dependencies for 'make headers_install'.
  [S390] Unexport <asm/z90crypt.h>, export <asm/zcrypt.h> in its place.
  Remove dead netfilter_logging.h from include/linux/Kbuild
  Remove offsetof() from user-visible <linux/stddef.h>
  Clean up exported headers on CRIS
  Fix v850 exported headers
  Don't advertise (or allow) headers_{install,check} where inappropriate.
  Remove UML header export
  Remove ARM26 header export.
  Fix H8300 exported headers.
  Fix m68knommu exported headers
  Fix exported headers for SPARC, SPARC64
  Fix 'make headers_check' on m32r
  Fix 'make headers_check' on sh64
  Fix 'make headers_check' on sh
  [HEADERS] Fix ARM 'make headers_check'

Initial pass of manual conflict resolution in top-level Makefile over
conflicting build rule and headers_install changes.
---

398477d4bd57cc33792fd93035c2763ad78629c4
diff --cc Makefile
index fce530a66e3,b78c88d1f1a..7a06c16602f
--- a/Makefile
+++ b/Makefile
@@@ -921,11 -892,22 +921,23 @@@ depend dep
  INSTALL_HDR_PATH=$(objtree)/usr
  export INSTALL_HDR_PATH
  
+ HDRARCHES=$(filter-out generic,$(patsubst $(srctree)/include/asm-%/Kbuild,%,$(wildcard $(srctree)/include/asm-*/Kbuild)))
+ 
+ PHONY += headers_install_all
 -headers_install_all: include/linux/version.h
 -	$(Q)unifdef -Ux /dev/null
++headers_install_all: include/linux/version.h scripts_basic FORCE
++	$(Q)$(MAKE) $(build)=scripts scripts/unifdef
+ 	$(Q)for arch in $(HDRARCHES); do \
 -	 $(MAKE) ARCH=$$arch -rR -f $(srctree)/scripts/Makefile.headersinst obj=include BIASMDIR=-bi-$$arch ;\
++	 $(MAKE) ARCH=$$arch -f $(srctree)/scripts/Makefile.headersinst obj=include BIASMDIR=-bi-$$arch ;\
+ 	 done
+ 
  PHONY += headers_install
 -headers_install: include/linux/version.h
 +headers_install: include/linux/version.h scripts_basic FORCE
+ 	@if [ ! -r include/asm-$(ARCH)/Kbuild ]; then \
+ 	  echo '*** Error: Headers not exportable for this architecture ($(ARCH))'; \
+ 	  exit 1 ; fi
 -	$(Q)unifdef -Ux /dev/null
 -	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include
 +	$(Q)$(MAKE) $(build)=scripts scripts/unifdef
 +	$(Q)rm -rf $(INSTALL_HDR_PATH)/include
 +	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst obj=include
  
  PHONY += headers_check
  headers_check: headers_install