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

Commit 5974eaae authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Move HWCAP_* definitions to asm/elf.h 



Move HWCAP_* definitions into asm/elf.h, where they should belong.
Since userspace wants to get at these definitions by including
asm/procinfo.h, include asm/elf.h from this file if __KERNEL__
is not defined, and issue a warning suggesting to fix the program
up to use asm/elf.h instead.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ee90dabc

include/asm-arm/elf.h

+14 −2
Original line number Diff line number Diff line
@@ -39,9 +39,21 @@ typedef struct user_fp elf_fpregset_t; 
#endif

#define ELF_ARCH	EM_ARM



#ifdef __KERNEL__

#include <asm/procinfo.h>

/*

 * HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP

 */

#define HWCAP_SWP	1

#define HWCAP_HALF	2

#define HWCAP_THUMB	4

#define HWCAP_26BIT	8	/* Play it safe */

#define HWCAP_FAST_MULT	16

#define HWCAP_FPA	32

#define HWCAP_VFP	64

#define HWCAP_EDSP	128

#define HWCAP_JAVA	256

#define HWCAP_IWMMXT	512



#ifdef __KERNEL__

#ifndef __ASSEMBLY__

/*

 * This yields a mask that user programs can use to figure out what

include/asm-arm/procinfo.h

+5 −16
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#ifndef __ASM_PROCINFO_H

#define __ASM_PROCINFO_H



#ifndef __ASSEMBLY__

#ifdef __KERNEL__



struct cpu_tlb_fns;

struct cpu_user_fns;
@@ -42,19 +42,8 @@ struct proc_info_list { 
	struct cpu_cache_fns	*cache;

};



extern unsigned int elf_hwcap;



#endif	/* __ASSEMBLY__ */



#define HWCAP_SWP	1

#define HWCAP_HALF	2

#define HWCAP_THUMB	4

#define HWCAP_26BIT	8	/* Play it safe */

#define HWCAP_FAST_MULT	16

#define HWCAP_FPA	32

#define HWCAP_VFP	64

#define HWCAP_EDSP	128

#define HWCAP_JAVA	256

#define HWCAP_IWMMXT	512



#else	/* __KERNEL__ */

#include <asm/elf.h>

#warning "Please include asm/elf.h instead"

#endif	/* __KERNEL__ */

#endif