Commit 6ff6340a authored by David Woodhouse's avatar David Woodhouse
Browse files

[HEADERS] Fix ARM 'make headers_check' 



Sanitise the ARM headers exported to userspace.

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 1f8b444c

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)