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

Commit 3b2267e0 authored by David Howells's avatar David Howells
Browse files

UAPI: (Scripted) Disintegrate arch/mn10300/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/mn10300/include/asm/Kbuild

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



generic-y += clkdev.h

generic-y += exec.h

arch/mn10300/include/asm/ptrace.h

+1 −71
Original line number Diff line number Diff line
@@ -11,77 +11,8 @@ 
#ifndef _ASM_PTRACE_H

#define _ASM_PTRACE_H



#define PT_A3		0

#define PT_A2		1

#define PT_D3		2

#define	PT_D2		3

#define PT_MCVF		4

#define	PT_MCRL		5

#define PT_MCRH		6

#define	PT_MDRQ		7

#define	PT_E1		8

#define	PT_E0		9

#define	PT_E7		10

#define	PT_E6		11

#define	PT_E5		12

#define	PT_E4		13

#define	PT_E3		14

#define	PT_E2		15

#define	PT_SP		16

#define	PT_LAR		17

#define	PT_LIR		18

#define	PT_MDR		19

#define	PT_A1		20

#define	PT_A0		21

#define	PT_D1		22

#define	PT_D0		23

#define PT_ORIG_D0	24

#define	PT_EPSW		25

#define	PT_PC		26

#define NR_PTREGS	27

#include <uapi/asm/ptrace.h>



/*

 * This defines the way registers are stored in the event of an exception

 * - the strange order is due to the MOVM instruction

 */

struct pt_regs {

	unsigned long		a3;		/* syscall arg 3 */

	unsigned long		a2;		/* syscall arg 4 */

	unsigned long		d3;		/* syscall arg 5 */

	unsigned long		d2;		/* syscall arg 6 */

	unsigned long		mcvf;

	unsigned long		mcrl;

	unsigned long		mcrh;

	unsigned long		mdrq;

	unsigned long		e1;

	unsigned long		e0;

	unsigned long		e7;

	unsigned long		e6;

	unsigned long		e5;

	unsigned long		e4;

	unsigned long		e3;

	unsigned long		e2;

	unsigned long		sp;

	unsigned long		lar;

	unsigned long		lir;

	unsigned long		mdr;

	unsigned long		a1;

	unsigned long		a0;		/* syscall arg 1 */

	unsigned long		d1;		/* syscall arg 2 */

	unsigned long		d0;		/* syscall ret */

	struct pt_regs		*next;		/* next frame pointer */

	unsigned long		orig_d0;	/* syscall number */

	unsigned long		epsw;

	unsigned long		pc;

};



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



#ifdef __KERNEL__



#define user_mode(regs)			(((regs)->epsw & EPSW_nSL) == EPSW_nSL)

#define instruction_pointer(regs)	((regs)->pc)
@@ -91,5 +22,4 @@ struct pt_regs { 


#define profile_pc(regs) ((regs)->pc)



#endif /* __KERNEL__  */

#endif /* _ASM_PTRACE_H */

arch/mn10300/include/asm/setup.h

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ 
#ifndef _ASM_SETUP_H

#define _ASM_SETUP_H



#ifdef __KERNEL__

#include <uapi/asm/setup.h>



extern void __init unit_setup(void);

extern void __init unit_init_IRQ(void);

#endif

#endif /* _ASM_SETUP_H */

arch/mn10300/include/asm/signal.h

+1 −120
Original line number Diff line number Diff line
@@ -11,12 +11,8 @@ 
#ifndef _ASM_SIGNAL_H

#define _ASM_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

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

} 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



/*

 * SA_FLAGS values:

 *

 * SA_ONSTACK indicates that a registered stack_t will be used.

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

 * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.

 * SA_RESETHAND clears the handler when the signal is delivered.

 * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.

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

 *

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

 * Unix names RESETHAND and NODEFER respectively.

 */

#define SA_NOCLDSTOP	0x00000001U

#define SA_NOCLDWAIT	0x00000002U

#define SA_SIGINFO	0x00000004U

#define SA_ONSTACK	0x08000000U

#define SA_RESTART	0x10000000U

#define SA_NODEFER	0x40000000U

#define SA_RESETHAND	0x80000000U



#define SA_NOMASK	SA_NODEFER

#define SA_ONESHOT	SA_RESETHAND



#define SA_RESTORER	0x04000000



/*

 * 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 {

	__sighandler_t sa_handler;

	old_sigset_t sa_mask;
@@ -135,37 +43,10 @@ struct sigaction { 
struct k_sigaction {

	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>





struct pt_regs;

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



#endif /* __KERNEL__ */



#endif /* _ASM_SIGNAL_H */

arch/mn10300/include/asm/termios.h

+1 −80
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,64 +10,4 @@ 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 */



/*

 * Translate a "termio" structure into a "termios". Ugh.

 */

#define SET_LOW_TERMIOS_BITS(termios, termio, x) { \

	unsigned short __tmp; \

	get_user(__tmp, &(termio)->x); \

	*(unsigned short *) &(termios)->x = __tmp; \

}



#define user_termio_to_kernel_termios(termios, termio) \

({ \

	SET_LOW_TERMIOS_BITS(termios, termio, c_iflag); \

	SET_LOW_TERMIOS_BITS(termios, termio, c_oflag); \

	SET_LOW_TERMIOS_BITS(termios, termio, c_cflag); \

	SET_LOW_TERMIOS_BITS(termios, termio, c_lflag); \

	copy_from_user((termios)->c_cc, (termio)->c_cc, NCC); \

})



/*

 * Translate a "termios" structure into a "termio". Ugh.

 */

#define kernel_termios_to_user_termio(termio, termios) \

({ \

	put_user((termios)->c_iflag, &(termio)->c_iflag); \

	put_user((termios)->c_oflag, &(termio)->c_oflag); \

	put_user((termios)->c_cflag, &(termio)->c_cflag); \

	put_user((termios)->c_lflag, &(termio)->c_lflag); \

	put_user((termios)->c_line,  &(termio)->c_line); \

	copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \

})



#define user_termios_to_kernel_termios(k, u) \

	copy_from_user(k, u, sizeof(struct termios2))

#define kernel_termios_to_user_termios(u, k) \

	copy_to_user(u, k, sizeof(struct termios2))

#define user_termios_to_kernel_termios_1(k, u) \

	copy_from_user(k, u, sizeof(struct termios))

#define kernel_termios_to_user_termios_1(u, k) \

	copy_to_user(u, k, sizeof(struct termios))



#endif	/* _ASM_TERMIOS_H */