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

Commit cb8db5d4 authored by David Howells's avatar David Howells
Browse files

UAPI: (Scripted) Disintegrate arch/arm/include/asm 



Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarMichael Kerrisk <mtk.manpages@gmail.com>
Acked-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: default avatarDave Jones <davej@redhat.com>
parent 4f1cd914

arch/arm/include/asm/Kbuild

+0 −2
Original line number Original line Diff line number Diff line 
include include/asm-generic/Kbuild.asm





header-y += hwcap.h





generic-y += auxvec.h

generic-y += auxvec.h

generic-y += bitsperlong.h

generic-y += bitsperlong.h

arch/arm/include/asm/hwcap.h

+1 −26
Original line number Original line Diff line number Diff line 
#ifndef __ASMARM_HWCAP_H

#ifndef __ASMARM_HWCAP_H

#define __ASMARM_HWCAP_H

#define __ASMARM_HWCAP_H





/*

#include <uapi/asm/hwcap.h>

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

 */

#define HWCAP_SWP	(1 << 0)

#define HWCAP_HALF	(1 << 1)

#define HWCAP_THUMB	(1 << 2)

#define HWCAP_26BIT	(1 << 3)	/* Play it safe */

#define HWCAP_FAST_MULT	(1 << 4)

#define HWCAP_FPA	(1 << 5)

#define HWCAP_VFP	(1 << 6)

#define HWCAP_EDSP	(1 << 7)

#define HWCAP_JAVA	(1 << 8)

#define HWCAP_IWMMXT	(1 << 9)

#define HWCAP_CRUNCH	(1 << 10)

#define HWCAP_THUMBEE	(1 << 11)

#define HWCAP_NEON	(1 << 12)

#define HWCAP_VFPv3	(1 << 13)

#define HWCAP_VFPv3D16	(1 << 14)

#define HWCAP_TLS	(1 << 15)

#define HWCAP_VFPv4	(1 << 16)

#define HWCAP_IDIVA	(1 << 17)

#define HWCAP_IDIVT	(1 << 18)

#define HWCAP_IDIV	(HWCAP_IDIVA | HWCAP_IDIVT)





#if defined(__KERNEL__)

#if !defined(__ASSEMBLY__)

#if !defined(__ASSEMBLY__)

/*

/*

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

 * This yields a mask that user programs can use to figure out what
@@ -35,5 +12,3 @@ 
extern unsigned int elf_hwcap;

extern unsigned int elf_hwcap;

#endif

#endif

#endif
 
#endif
 


#endif

arch/arm/include/asm/ptrace.h

+1 −126
Original line number Original line Diff line number Diff line
@@ -10,133 +10,12 @@ 
#ifndef __ASM_ARM_PTRACE_H

#ifndef __ASM_ARM_PTRACE_H

#define __ASM_ARM_PTRACE_H

#define __ASM_ARM_PTRACE_H





#include <asm/hwcap.h>

#include <uapi/asm/ptrace.h>



#define PTRACE_GETREGS		12

#define PTRACE_SETREGS		13

#define PTRACE_GETFPREGS	14

#define PTRACE_SETFPREGS	15

/* PTRACE_ATTACH is 16 */

/* PTRACE_DETACH is 17 */

#define PTRACE_GETWMMXREGS	18

#define PTRACE_SETWMMXREGS	19

/* 20 is unused */

#define PTRACE_OLDSETOPTIONS	21

#define PTRACE_GET_THREAD_AREA	22

#define PTRACE_SET_SYSCALL	23

/* PTRACE_SYSCALL is 24 */

#define PTRACE_GETCRUNCHREGS	25

#define PTRACE_SETCRUNCHREGS	26

#define PTRACE_GETVFPREGS	27

#define PTRACE_SETVFPREGS	28

#define PTRACE_GETHBPREGS	29

#define PTRACE_SETHBPREGS	30



/*

 * PSR bits

 */

#define USR26_MODE	0x00000000

#define FIQ26_MODE	0x00000001

#define IRQ26_MODE	0x00000002

#define SVC26_MODE	0x00000003

#define USR_MODE	0x00000010

#define FIQ_MODE	0x00000011

#define IRQ_MODE	0x00000012

#define SVC_MODE	0x00000013

#define ABT_MODE	0x00000017

#define HYP_MODE	0x0000001a

#define UND_MODE	0x0000001b

#define SYSTEM_MODE	0x0000001f

#define MODE32_BIT	0x00000010

#define MODE_MASK	0x0000001f

#define PSR_T_BIT	0x00000020

#define PSR_F_BIT	0x00000040

#define PSR_I_BIT	0x00000080

#define PSR_A_BIT	0x00000100

#define PSR_E_BIT	0x00000200

#define PSR_J_BIT	0x01000000

#define PSR_Q_BIT	0x08000000

#define PSR_V_BIT	0x10000000

#define PSR_C_BIT	0x20000000

#define PSR_Z_BIT	0x40000000

#define PSR_N_BIT	0x80000000



/*

 * Groups of PSR bits

 */

#define PSR_f		0xff000000	/* Flags		*/

#define PSR_s		0x00ff0000	/* Status		*/

#define PSR_x		0x0000ff00	/* Extension		*/

#define PSR_c		0x000000ff	/* Control		*/



/*

 * ARMv7 groups of PSR bits

 */

#define APSR_MASK	0xf80f0000	/* N, Z, C, V, Q and GE flags */

#define PSR_ISET_MASK	0x01000010	/* ISA state (J, T) mask */

#define PSR_IT_MASK	0x0600fc00	/* If-Then execution state mask */

#define PSR_ENDIAN_MASK	0x00000200	/* Endianness state mask */



/*

 * Default endianness state

 */

#ifdef CONFIG_CPU_ENDIAN_BE8

#define PSR_ENDSTATE	PSR_E_BIT

#else

#define PSR_ENDSTATE	0

#endif



/* 

 * These are 'magic' values for PTRACE_PEEKUSR that return info about where a

 * process is located in memory.

 */

#define PT_TEXT_ADDR		0x10000

#define PT_DATA_ADDR		0x10004

#define PT_TEXT_END_ADDR	0x10008





#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__



/*

 * This struct defines the way the registers are stored on the

 * stack during a system call.  Note that sizeof(struct pt_regs)

 * has to be a multiple of 8.

 */

#ifndef __KERNEL__

struct pt_regs {

	long uregs[18];

};

#else /* __KERNEL__ */

struct pt_regs {

struct pt_regs {

	unsigned long uregs[18];

	unsigned long uregs[18];

};

};

#endif /* __KERNEL__ */



#define ARM_cpsr	uregs[16]

#define ARM_pc		uregs[15]

#define ARM_lr		uregs[14]

#define ARM_sp		uregs[13]

#define ARM_ip		uregs[12]

#define ARM_fp		uregs[11]

#define ARM_r10		uregs[10]

#define ARM_r9		uregs[9]

#define ARM_r8		uregs[8]

#define ARM_r7		uregs[7]

#define ARM_r6		uregs[6]

#define ARM_r5		uregs[5]

#define ARM_r4		uregs[4]

#define ARM_r3		uregs[3]

#define ARM_r2		uregs[2]

#define ARM_r1		uregs[1]

#define ARM_r0		uregs[0]

#define ARM_ORIG_r0	uregs[17]



/*

 * The size of the user-visible VFP state as seen by PTRACE_GET/SETVFPREGS

 * and core dumps.

 */

#define ARM_VFPREGS_SIZE ( 32 * 8 /*fpregs*/ + 4 /*fpscr*/ )



#ifdef __KERNEL__





#define user_mode(regs)	\

#define user_mode(regs)	\

	(((regs)->ARM_cpsr & 0xf) == 0)

	(((regs)->ARM_cpsr & 0xf) == 0)
@@ -260,9 +139,5 @@ static inline unsigned long user_stack_pointer(struct pt_regs *regs) 
	(struct pt_regs *)((sp | (THREAD_SIZE - 1)) - 7) - 1;	\

	(struct pt_regs *)((sp | (THREAD_SIZE - 1)) - 7) - 1;	\

})

})





#endif /* __KERNEL__ */



#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLY__ */



#endif
 
#endif

arch/arm/include/asm/setup.h

+1 −171
Original line number Original line Diff line number Diff line
@@ -14,176 +14,8 @@ 
#ifndef __ASMARM_SETUP_H

#ifndef __ASMARM_SETUP_H

#define __ASMARM_SETUP_H

#define __ASMARM_SETUP_H





#include <linux/types.h>

#include <uapi/asm/setup.h>





#define COMMAND_LINE_SIZE 1024



/* The list ends with an ATAG_NONE node. */

#define ATAG_NONE	0x00000000



struct tag_header {

	__u32 size;

	__u32 tag;

};



/* The list must start with an ATAG_CORE node */

#define ATAG_CORE	0x54410001



struct tag_core {

	__u32 flags;		/* bit 0 = read-only */

	__u32 pagesize;

	__u32 rootdev;

};



/* it is allowed to have multiple ATAG_MEM nodes */

#define ATAG_MEM	0x54410002



struct tag_mem32 {

	__u32	size;

	__u32	start;	/* physical start address */

};



/* VGA text type displays */

#define ATAG_VIDEOTEXT	0x54410003



struct tag_videotext {

	__u8		x;

	__u8		y;

	__u16		video_page;

	__u8		video_mode;

	__u8		video_cols;

	__u16		video_ega_bx;

	__u8		video_lines;

	__u8		video_isvga;

	__u16		video_points;

};



/* describes how the ramdisk will be used in kernel */

#define ATAG_RAMDISK	0x54410004



struct tag_ramdisk {

	__u32 flags;	/* bit 0 = load, bit 1 = prompt */

	__u32 size;	/* decompressed ramdisk size in _kilo_ bytes */

	__u32 start;	/* starting block of floppy-based RAM disk image */

};



/* describes where the compressed ramdisk image lives (virtual address) */

/*

 * this one accidentally used virtual addresses - as such,

 * it's deprecated.

 */

#define ATAG_INITRD	0x54410005



/* describes where the compressed ramdisk image lives (physical address) */

#define ATAG_INITRD2	0x54420005



struct tag_initrd {

	__u32 start;	/* physical start address */

	__u32 size;	/* size of compressed ramdisk image in bytes */

};



/* board serial number. "64 bits should be enough for everybody" */

#define ATAG_SERIAL	0x54410006



struct tag_serialnr {

	__u32 low;

	__u32 high;

};



/* board revision */

#define ATAG_REVISION	0x54410007



struct tag_revision {

	__u32 rev;

};



/* initial values for vesafb-type framebuffers. see struct screen_info

 * in include/linux/tty.h

 */

#define ATAG_VIDEOLFB	0x54410008



struct tag_videolfb {

	__u16		lfb_width;

	__u16		lfb_height;

	__u16		lfb_depth;

	__u16		lfb_linelength;

	__u32		lfb_base;

	__u32		lfb_size;

	__u8		red_size;

	__u8		red_pos;

	__u8		green_size;

	__u8		green_pos;

	__u8		blue_size;

	__u8		blue_pos;

	__u8		rsvd_size;

	__u8		rsvd_pos;

};



/* command line: \0 terminated string */

#define ATAG_CMDLINE	0x54410009



struct tag_cmdline {

	char	cmdline[1];	/* this is the minimum size */

};



/* acorn RiscPC specific information */

#define ATAG_ACORN	0x41000101



struct tag_acorn {

	__u32 memc_control_reg;

	__u32 vram_pages;

	__u8 sounddefault;

	__u8 adfsdrives;

};



/* footbridge memory clock, see arch/arm/mach-footbridge/arch.c */

#define ATAG_MEMCLK	0x41000402



struct tag_memclk {

	__u32 fmemclk;

};



struct tag {

	struct tag_header hdr;

	union {

		struct tag_core		core;

		struct tag_mem32	mem;

		struct tag_videotext	videotext;

		struct tag_ramdisk	ramdisk;

		struct tag_initrd	initrd;

		struct tag_serialnr	serialnr;

		struct tag_revision	revision;

		struct tag_videolfb	videolfb;

		struct tag_cmdline	cmdline;



		/*

		 * Acorn specific

		 */

		struct tag_acorn	acorn;



		/*

		 * DC21285 specific

		 */

		struct tag_memclk	memclk;

	} u;

};



struct tagtable {

	__u32 tag;

	int (*parse)(const struct tag *);

};



#define tag_member_present(tag,member)				\

	((unsigned long)(&((struct tag *)0L)->member + 1)	\

		<= (tag)->hdr.size * 4)



#define tag_next(t)	((struct tag *)((__u32 *)(t) + (t)->hdr.size))

#define tag_size(type)	((sizeof(struct tag_header) + sizeof(struct type)) >> 2)



#define for_each_tag(t,base)		\

	for (t = base; t->hdr.size; t = tag_next(t))



#ifdef __KERNEL__





#define __tag __used __attribute__((__section__(".taglist.init")))

#define __tag __used __attribute__((__section__(".taglist.init")))

#define __tagtable(tag, fn) \

#define __tagtable(tag, fn) \
@@ -221,6 +53,4 @@ extern int arm_add_memory(phys_addr_t start, phys_addr_t size); 
extern void early_print(const char *str, ...);

extern void early_print(const char *str, ...);

extern void dump_machine_table(void);

extern void dump_machine_table(void);





#endif  /*  __KERNEL__  */



#endif
 
#endif

arch/arm/include/asm/signal.h

+1 −126
Original line number Original line Diff line number Diff line 
#ifndef _ASMARM_SIGNAL_H

#ifndef _ASMARM_SIGNAL_H

#define _ASMARM_SIGNAL_H

#define _ASMARM_SIGNAL_H





#include <linux/types.h>

#include <uapi/asm/signal.h>





/* Avoid too many header ordering problems.  */

struct siginfo;



#ifdef __KERNEL__

/* Most things should be clean enough to redefine this at will, if care

/* Most things should be clean enough to redefine this at will, if care

   is taken to make libc match.  */

   is taken to make libc match.  */
@@ -20,100 +16,6 @@ typedef struct { 
	unsigned long sig[_NSIG_WORDS];

	unsigned long sig[_NSIG_WORDS];

} sigset_t;

} sigset_t;





#else

/* Here we must cater to libcs that poke about in kernel headers.  */



#define NSIG		32

typedef unsigned long sigset_t;



#endif /* __KERNEL__ */



#define SIGHUP		 1

#define SIGINT		 2

#define SIGQUIT		 3

#define SIGILL		 4

#define SIGTRAP		 5

#define SIGABRT		 6

#define SIGIOT		 6

#define SIGBUS		 7

#define SIGFPE		 8

#define SIGKILL		 9

#define SIGUSR1		10

#define SIGSEGV		11

#define SIGUSR2		12

#define SIGPIPE		13

#define SIGALRM		14

#define SIGTERM		15

#define SIGSTKFLT	16

#define SIGCHLD		17

#define SIGCONT		18

#define SIGSTOP		19

#define SIGTSTP		20

#define SIGTTIN		21

#define SIGTTOU		22

#define SIGURG		23

#define SIGXCPU		24

#define SIGXFSZ		25

#define SIGVTALRM	26

#define SIGPROF		27

#define SIGWINCH	28

#define SIGIO		29

#define SIGPOLL		SIGIO

/*

#define SIGLOST		29

*/

#define SIGPWR		30

#define SIGSYS		31

#define	SIGUNUSED	31



/* These should not be considered constants from userland.  */

#define SIGRTMIN	32

#define SIGRTMAX	_NSIG



#define SIGSWI		32



/*

 * SA_FLAGS values:

 *

 * SA_NOCLDSTOP		flag to turn off SIGCHLD when children stop.

 * SA_NOCLDWAIT		flag on SIGCHLD to inhibit zombies.

 * SA_SIGINFO		deliver the signal with SIGINFO structs

 * SA_THIRTYTWO		delivers the signal in 32-bit mode, even if the task 

 *			is running in 26-bit.

 * SA_ONSTACK		allows alternate signal stacks (see sigaltstack(2)).

 * SA_RESTART		flag to get restarting signals (which were the default long ago)

 * SA_NODEFER		prevents the current signal from being masked in the handler.

 * SA_RESETHAND		clears the handler when the signal is delivered.

 *

 * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single

 * Unix names RESETHAND and NODEFER respectively.

 */

#define SA_NOCLDSTOP	0x00000001

#define SA_NOCLDWAIT	0x00000002

#define SA_SIGINFO	0x00000004

#define SA_THIRTYTWO	0x02000000

#define SA_RESTORER	0x04000000

#define SA_ONSTACK	0x08000000

#define SA_RESTART	0x10000000

#define SA_NODEFER	0x40000000

#define SA_RESETHAND	0x80000000



#define SA_NOMASK	SA_NODEFER

#define SA_ONESHOT	SA_RESETHAND





/* 

 * sigaltstack controls

 */

#define SS_ONSTACK	1

#define SS_DISABLE	2



#define MINSIGSTKSZ	2048

#define SIGSTKSZ	8192



#include <asm-generic/signal-defs.h>



#ifdef __KERNEL__

struct old_sigaction {

struct old_sigaction {

	__sighandler_t sa_handler;

	__sighandler_t sa_handler;

	old_sigset_t sa_mask;

	old_sigset_t sa_mask;
@@ -132,33 +34,6 @@ struct k_sigaction { 
	struct sigaction sa;

	struct sigaction sa;

};

};





#else

/* Here we must cater to libcs that poke about in kernel headers.  */



struct sigaction {

	union {

	  __sighandler_t _sa_handler;

	  void (*_sa_sigaction)(int, struct siginfo *, void *);

	} _u;

	sigset_t sa_mask;

	unsigned long sa_flags;

	void (*sa_restorer)(void);

};



#define sa_handler	_u._sa_handler

#define sa_sigaction	_u._sa_sigaction



#endif /* __KERNEL__ */



typedef struct sigaltstack {

	void __user *ss_sp;

	int ss_flags;

	size_t ss_size;

} stack_t;



#ifdef __KERNEL__

#include <asm/sigcontext.h>

#include <asm/sigcontext.h>

#define ptrace_signal_deliver(regs, cookie) do { } while (0)

#define ptrace_signal_deliver(regs, cookie) do { } while (0)

#endif
 
#endif
 


#endif