diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-09-21 08:34:39 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-10-13 13:23:23 -0700 |
| commit | 9600bbe8ae8e71cb9b49d0b2beaf6976803b63cc (patch) | |
| tree | d88a9b538a635fb0ff18c65c177049df2a128515 /include | |
| parent | b586fa1802e3ed67d7b5c5ef3d4fe9c0d9ec5110 (diff) | |
| download | lwn-9600bbe8ae8e71cb9b49d0b2beaf6976803b63cc.tar.gz lwn-9600bbe8ae8e71cb9b49d0b2beaf6976803b63cc.zip | |
Fix ARM 'make headers_check'
Sanitise the ARM headers exported to userspace.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/elf.h | 18 | ||||
| -rw-r--r-- | include/asm-arm/page.h | 4 |
2 files changed, 10 insertions, 12 deletions
diff --git a/include/asm-arm/elf.h b/include/asm-arm/elf.h index ae7baa6c73f7..17f0c656d272 100644 --- a/include/asm-arm/elf.h +++ b/include/asm-arm/elf.h @@ -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]; @@ -32,11 +29,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. */ #define ELF_CLASS ELFCLASS32 @@ -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. */ diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h index b721270b9986..02bd3ee935b0 100644 --- a/include/asm-arm/page.h +++ b/include/asm-arm/page.h @@ -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) |