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

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

UAPI: (Scripted) Disintegrate arch/frv/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 42859eea

arch/frv/include/asm/Kbuild

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



header-y += registers.h

header-y += termios.h

generic-y += clkdev.h

generic-y += exec.h

arch/frv/include/asm/ptrace.h

+1 −50
Original line number Diff line number Diff line
@@ -11,58 +11,10 @@ 
#ifndef _ASM_PTRACE_H

#define _ASM_PTRACE_H



#include <asm/registers.h>

#ifdef __KERNEL__

#include <asm/irq_regs.h>

#include <uapi/asm/ptrace.h>



#define in_syscall(regs) (((regs)->tbr & TBR_TT) == TBR_TT_TRAP0)

#endif





#define PT_PSR		0

#define	PT_ISR		1

#define PT_CCR		2

#define PT_CCCR		3

#define PT_LR		4

#define PT_LCR		5

#define PT_PC		6



#define PT__STATUS	7	/* exception status */

#define PT_SYSCALLNO	8	/* syscall number or -1 */

#define PT_ORIG_GR8	9	/* saved GR8 for signal handling */

#define PT_GNER0	10

#define PT_GNER1	11

#define PT_IACC0H	12

#define PT_IACC0L	13



#define PT_GR(j)	( 14 + (j))	/* GRj for 0<=j<=63 */

#define PT_FR(j)	( 78 + (j))	/* FRj for 0<=j<=63 */

#define PT_FNER(j)	(142 + (j))	/* FNERj for 0<=j<=1 */

#define PT_MSR(j)	(144 + (j))	/* MSRj for 0<=j<=2 */

#define PT_ACC(j)	(146 + (j))	/* ACCj for 0<=j<=7 */

#define PT_ACCG(jklm)	(154 + (jklm))	/* ACCGjklm for 0<=jklm<=1 (reads four regs per slot) */

#define PT_FSR(j)	(156 + (j))	/* FSRj for 0<=j<=0 */

#define PT__GPEND	78

#define PT__END		157



#define PT_TBR		PT_GR(0)

#define PT_SP		PT_GR(1)

#define PT_FP		PT_GR(2)

#define PT_PREV_FRAME	PT_GR(28)	/* previous exception frame pointer (old gr28 value) */

#define PT_CURR_TASK	PT_GR(29)	/* current task */





/* Arbitrarily choose the same ptrace numbers as used by the Sparc code. */

#define PTRACE_GETREGS		12

#define PTRACE_SETREGS		13

#define PTRACE_GETFPREGS	14

#define PTRACE_SETFPREGS	15

#define PTRACE_GETFDPIC		31	/* get the ELF fdpic loadmap address */



#define PTRACE_GETFDPIC_EXEC	0	/* [addr] request the executable loadmap */

#define PTRACE_GETFDPIC_INTERP	1	/* [addr] request the interpreter loadmap */



#ifdef __KERNEL__

#ifndef __ASSEMBLY__



struct task_struct;
@@ -85,5 +37,4 @@ extern unsigned long user_stack(const struct pt_regs *); 
#define arch_has_single_step()	(1)



#endif /* !__ASSEMBLY__ */

#endif /* __KERNEL__ */

#endif /* _ASM_PTRACE_H */

arch/frv/include/asm/setup.h

+1 −6
Original line number Diff line number Diff line
@@ -8,15 +8,12 @@ 
 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */



#ifndef _ASM_SETUP_H

#define _ASM_SETUP_H



#define COMMAND_LINE_SIZE       512



#ifdef __KERNEL__



#include <linux/init.h>

#include <uapi/asm/setup.h>



#ifndef __ASSEMBLY__
@@ -26,6 +23,4 @@ extern unsigned long __initdata num_mappedpages; 


#endif /* !__ASSEMBLY__ */



#endif  /*  __KERNEL__  */



#endif /* _ASM_SETUP_H */

arch/frv/include/asm/signal.h

+1 −32
Original line number Diff line number Diff line 
#ifndef _ASM_SIGNAL_H

#define _ASM_SIGNAL_H



#include <linux/types.h>

#include <uapi/asm/signal.h>



#ifndef __KERNEL__

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



#define NSIG		32

typedef unsigned long sigset_t;



#endif /* !__KERNEL__ */



#define SA_RESTORER	0x04000000 /* to get struct sigaction correct */



#include <asm-generic/signal.h>



#ifdef __KERNEL__

struct old_sigaction {

	__sighandler_t sa_handler;

	old_sigset_t sa_mask;
@@ -23,22 +10,4 @@ struct old_sigaction { 
	__sigrestore_t sa_restorer;

};



#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__ */



#endif /* _ASM_SIGNAL_H */

arch/frv/include/asm/termios.h

+1 −45
Original line number Diff line number Diff line 
#ifndef _ASM_TERMIOS_H

#define _ASM_TERMIOS_H



#include <asm/termbits.h>

#include <asm/ioctls.h>

#include <uapi/asm/termios.h>



struct winsize {

	unsigned short ws_row;

	unsigned short ws_col;

	unsigned short ws_xpixel;

	unsigned short ws_ypixel;

};



#define NCC 8

struct termio {

	unsigned short c_iflag;		/* input mode flags */

	unsigned short c_oflag;		/* output mode flags */

	unsigned short c_cflag;		/* control mode flags */

	unsigned short c_lflag;		/* local mode flags */

	unsigned char c_line;		/* line discipline */

	unsigned char c_cc[NCC];	/* control characters */

};



#ifdef __KERNEL__

/*	intr=^C		quit=^|		erase=del	kill=^U

	eof=^D		vtime=\0	vmin=\1		sxtc=\0

	start=^Q	stop=^S		susp=^Z		eol=\0
@@ -29,30 +10,5 @@ struct termio { 
	eol2=\0

*/

#define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"

#endif



/* modem lines */

#define TIOCM_LE	0x001

#define TIOCM_DTR	0x002

#define TIOCM_RTS	0x004

#define TIOCM_ST	0x008

#define TIOCM_SR	0x010

#define TIOCM_CTS	0x020

#define TIOCM_CAR	0x040

#define TIOCM_RNG	0x080

#define TIOCM_DSR	0x100

#define TIOCM_CD	TIOCM_CAR

#define TIOCM_RI	TIOCM_RNG

#define TIOCM_OUT1	0x2000

#define TIOCM_OUT2	0x4000

#define TIOCM_LOOP	0x8000



#define TIOCM_MODEM_BITS       TIOCM_OUT2      /* IRDA support */



/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */



#ifdef __KERNEL__

#include <asm-generic/termios-base.h>

#endif



#endif /* _ASM_TERMIOS_H */