Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fa0cb11 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/hdrinstall-2.6 

* git://git.infradead.org/hdrinstall-2.6:
  Remove export of include/linux/isdn/tpam.h
  Remove <linux/i2c-id.h> and <linux/i2c-algo-ite.h> from userspace export
  Restrict headers exported to userspace for SPARC and SPARC64
  Add empty Kbuild files for 'make headers_install' in remaining arches.
  Add Kbuild file for Alpha 'make headers_install'
  Add Kbuild file for SPARC 'make headers_install'
  Add Kbuild file for IA64 'make headers_install'
  Add Kbuild file for S390 'make headers_install'
  Add Kbuild file for i386 'make headers_install'
  Add Kbuild file for x86_64 'make headers_install'
  Add Kbuild file for PowerPC 'make headers_install'
  Add generic Kbuild files for 'make headers_install'
  Basic implementation of 'make headers_check'
  Basic implementation of 'make headers_install'
parents c6482dde 257a5bde

Makefile

+17 −0
Original line number Diff line number Diff line
@@ -874,6 +874,21 @@ PHONY += depend dep 
depend dep:

	@echo '*** Warning: make $@ is unnecessary now.'



# ---------------------------------------------------------------------------

# Kernel headers

INSTALL_HDR_PATH=$(MODLIB)/abi

export INSTALL_HDR_PATH



PHONY += headers_install

headers_install: include/linux/version.h

	$(Q)unifdef -Ux /dev/null

	$(Q)rm -rf $(INSTALL_HDR_PATH)/include

	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include



PHONY += headers_check

headers_check: headers_install

	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include HDRCHECK=1



# ---------------------------------------------------------------------------

# Modules
@@ -1048,6 +1063,8 @@ help: 
	@echo  '  cscope	  - Generate cscope index'

	@echo  '  kernelrelease	  - Output the release version string'

	@echo  '  kernelversion	  - Output the version stored in Makefile'

	@echo  '  headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'

	@echo  '                    (default: /lib/modules/$$VERSION/abi)'

	@echo  ''

	@echo  'Static analysers'

	@echo  '  checkstack      - Generate a list of stack hogs'

include/Kbuild

0 → 100644
+2 −0
Original line number Diff line number Diff line 
header-y += asm-generic/ linux/ scsi/ sound/ mtd/ rdma/ video/

header-y += asm-$(ARCH)/

include/asm-alpha/Kbuild

0 → 100644
+5 −0
Original line number Diff line number Diff line 
include include/asm-generic/Kbuild.asm



unifdef-y += console.h fpu.h sysinfo.h



header-y += gentrap.h regdef.h pal.h reg.h

include/asm-arm/Kbuild

0 → 100644
+1 −0
Original line number Diff line number Diff line 
include include/asm-generic/Kbuild.asm

include/asm-arm26/Kbuild

0 → 100644
+1 −0
Original line number Diff line number Diff line 
include include/asm-generic/Kbuild.asm