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

Commit 398477d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 6e936d3e 6d716275

Makefile

+18 −2
Original line number Diff line number Diff line
@@ -921,8 +921,20 @@ 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 scripts_basic FORCE

	$(Q)$(MAKE) $(build)=scripts scripts/unifdef

	$(Q)for arch in $(HDRARCHES); do \

	 $(MAKE) ARCH=$$arch -f $(srctree)/scripts/Makefile.headersinst obj=include BIASMDIR=-bi-$$arch ;\

	 done



PHONY += headers_install

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)$(MAKE) $(build)=scripts scripts/unifdef

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

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst obj=include
@@ -1107,13 +1119,17 @@ 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'

	@if [ -r include/asm-$(ARCH)/Kbuild ]; then \

	 echo  '  headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'; \

	 fi

	@echo  '                    (default: $(INSTALL_HDR_PATH))'

	@echo  ''

	@echo  'Static analysers'

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

	@echo  '  namespacecheck  - Name space analysis on compiled kernel'

	@echo  '  headers_check   - Sanity check on exported headers'

	@if [ -r include/asm-$(ARCH)/Kbuild ]; then \

	 echo  '  headers_check   - Sanity check on exported headers'; \

	 fi

	@echo  ''

	@echo  'Kernel packaging:'

	@$(MAKE) $(build)=$(package-dir) help

arch/sh/kernel/process.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <asm/uaccess.h>

#include <asm/mmu_context.h>

#include <asm/elf.h>

#include <asm/ubc.h>



static int hlt_counter=0;

include/asm-arm/elf.h

+8 −10
Original line number Diff line number Diff line
@@ -8,9 +8,6 @@ 


#include <asm/ptrace.h>

#include <asm/user.h>

#ifdef __KERNEL

#include <asm/procinfo.h>

#endif



typedef unsigned long elf_greg_t;

typedef unsigned long elf_freg_t[3];
@@ -31,11 +28,6 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG]; 


typedef struct user_fp elf_fpregset_t;



/*

 * This is used to ensure we don't load something for the wrong architecture.

 */

#define elf_check_arch(x) ( ((x)->e_machine == EM_ARM) && (ELF_PROC_OK((x))) )



/*

 * These are used to set parameters in the core dumps.

 */
@@ -47,6 +39,14 @@ typedef struct user_fp elf_fpregset_t; 
#endif

#define ELF_ARCH	EM_ARM



#ifdef __KERNEL__

#include <asm/procinfo.h>



/*

 * This is used to ensure we don't load something for the wrong architecture.

 */

#define elf_check_arch(x) ( ((x)->e_machine == EM_ARM) && (ELF_PROC_OK((x))) )



#define USE_ELF_CORE_DUMP

#define ELF_EXEC_PAGESIZE	4096
@@ -83,8 +83,6 @@ typedef struct user_fp elf_fpregset_t; 
extern char elf_platform[];

#define ELF_PLATFORM	(elf_platform)



#ifdef __KERNEL__



/*

 * 32-bit code is always OK.  Some cpus can do 26-bit, some can't.

 */

include/asm-arm/page.h

+2 −2
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@ 
#define _ASMARM_PAGE_H





#ifdef __KERNEL__



/* PAGE_SHIFT determines the page size */

#define PAGE_SHIFT		12

#define PAGE_SIZE		(1UL << PAGE_SHIFT)

#define PAGE_MASK		(~(PAGE_SIZE-1))



#ifdef __KERNEL__



/* to align the pointer to the (next) page boundary */

#define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)

include/asm-arm26/Kbuild

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