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

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

UAPI: (Scripted) Disintegrate arch/cris/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 98d848ea

arch/cris/include/asm/Kbuild

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



header-y += arch-v10/

header-y += arch-v32/



header-y += ethernet.h

header-y += etraxgpio.h

header-y += rs485.h

header-y += sync_serial.h



generic-y += clkdev.h

arch/cris/include/asm/ptrace.h

+1 −4
Original line number Diff line number Diff line 
#ifndef _CRIS_PTRACE_H

#define _CRIS_PTRACE_H



#include <arch/ptrace.h>

#include <uapi/asm/ptrace.h>



#ifdef __KERNEL__



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

#define PTRACE_GETREGS            12
@@ -11,6 +10,4 @@ 


#define profile_pc(regs) instruction_pointer(regs)



#endif /* __KERNEL__ */



#endif /* _CRIS_PTRACE_H */

arch/cris/include/asm/signal.h

+1 −121
Original line number Diff line number Diff line 
#ifndef _ASM_CRIS_SIGNAL_H

#define _ASM_CRIS_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.  */
@@ -20,95 +16,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;
@@ -126,31 +33,6 @@ 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 *ss_sp;

	int ss_flags;

	size_t ss_size;

} stack_t;



#ifdef __KERNEL__

#include <asm/sigcontext.h>



/* here we could define asm-optimized sigaddset, sigdelset etc. operations.
@@ -158,6 +40,4 @@ typedef struct sigaltstack { 
 */

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



#endif /* __KERNEL__ */



#endif

arch/cris/include/asm/swab.h

+1 −2
Original line number Diff line number Diff line 
#ifndef _CRIS_SWAB_H

#define _CRIS_SWAB_H



#ifdef __KERNEL__

#include <arch/swab.h>

#endif /* __KERNEL__ */

#include <uapi/asm/swab.h>



#endif /* _CRIS_SWAB_H */

arch/cris/include/asm/termios.h

+1 −42
Original line number Diff line number Diff line 
#ifndef _CRIS_TERMIOS_H

#define _CRIS_TERMIOS_H



#include <asm/termbits.h>

#include <asm/ioctls.h>

#include <asm/rs485.h>

#include <linux/serial.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 */

};



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



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



#ifdef __KERNEL__



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

	eof=^D		vtime=\0	vmin=\1		sxtc=\0
@@ -87,6 +48,4 @@ struct termio { 
#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	/* __KERNEL__ */



#endif	/* _CRIS_TERMIOS_H */