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

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

UAPI: (Scripted) Disintegrate arch/m32r/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 752451f0

arch/m32r/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/m32r/include/asm/ptrace.h

+3 −107
Original line number Diff line number Diff line 
#ifndef _ASM_M32R_PTRACE_H

#define _ASM_M32R_PTRACE_H



/*

 * linux/include/asm-m32r/ptrace.h

 *
@@ -11,111 +8,12 @@ 
 * M32R version:

 *   Copyright (C) 2001-2002, 2004  Hirokazu Takata <takata at linux-m32r.org>

 */

#ifndef _ASM_M32R_PTRACE_H

#define _ASM_M32R_PTRACE_H



/* 0 - 13 are integer registers (general purpose registers).  */

#define PT_R4		0

#define PT_R5		1

#define PT_R6		2

#define PT_REGS 	3

#define PT_R0		4

#define PT_R1		5

#define PT_R2		6

#define PT_R3		7

#define PT_R7		8

#define PT_R8		9

#define PT_R9		10

#define PT_R10		11

#define PT_R11		12

#define PT_R12		13

#define PT_SYSCNR	14

#define PT_R13		PT_FP

#define PT_R14		PT_LR

#define PT_R15		PT_SP



/* processor status and miscellaneous context registers.  */

#define PT_ACC0H	15

#define PT_ACC0L	16

#define PT_ACC1H	17	/* ISA_DSP_LEVEL2 only */

#define PT_ACC1L	18	/* ISA_DSP_LEVEL2 only */

#define PT_PSW		19

#define PT_BPC		20

#define PT_BBPSW	21

#define PT_BBPC		22

#define PT_SPU		23

#define PT_FP		24

#define PT_LR		25

#define PT_SPI		26

#define PT_ORIGR0	27



/* virtual pt_reg entry for gdb */

#define PT_PC		30

#define PT_CBR		31

#define PT_EVB		32





/* Control registers.  */

#define SPR_CR0 PT_PSW

#define SPR_CR1 PT_CBR		/* read only */

#define SPR_CR2 PT_SPI

#define SPR_CR3 PT_SPU

#define SPR_CR4

#define SPR_CR5 PT_EVB		/* part of M32R/E, M32R/I core only */

#define SPR_CR6 PT_BPC

#define SPR_CR7

#define SPR_CR8 PT_BBPSW

#define SPR_CR9

#define SPR_CR10

#define SPR_CR11

#define SPR_CR12

#define SPR_CR13 PT_WR

#define SPR_CR14 PT_BBPC

#define SPR_CR15



/* this struct defines the way the registers are stored on the

   stack during a system call. */

struct pt_regs {

	/* Saved main processor registers. */

	unsigned long r4;

	unsigned long r5;

	unsigned long r6;

	struct pt_regs *pt_regs;

	unsigned long r0;

	unsigned long r1;

	unsigned long r2;

	unsigned long r3;

	unsigned long r7;

	unsigned long r8;

	unsigned long r9;

	unsigned long r10;

	unsigned long r11;

	unsigned long r12;

	long syscall_nr;



	/* Saved main processor status and miscellaneous context registers. */

	unsigned long acc0h;

	unsigned long acc0l;

	unsigned long acc1h;	/* ISA_DSP_LEVEL2 only */

	unsigned long acc1l;	/* ISA_DSP_LEVEL2 only */

	unsigned long psw;

	unsigned long bpc;		/* saved PC for TRAP syscalls */

	unsigned long bbpsw;

	unsigned long bbpc;

	unsigned long spu;		/* saved user stack */

	unsigned long fp;

	unsigned long lr;		/* saved PC for JL syscalls */

	unsigned long spi;		/* saved kernel stack */

	unsigned long orig_r0;

};



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

#define PTRACE_GETREGS		12

#define PTRACE_SETREGS		13



#define PTRACE_OLDSETOPTIONS	21



#ifdef __KERNEL__



#include <asm/m32r.h>		/* M32R_PSW_BSM, M32R_PSW_BPM */

#include <uapi/asm/ptrace.h>



#define arch_has_single_step() (1)
@@ -142,6 +40,4 @@ extern void withdraw_debug_trap(struct pt_regs *regs); 
#define current_pt_regs() ((struct pt_regs *) \

	((unsigned long)current_thread_info() + THREAD_SIZE) - 1)



#endif /* __KERNEL */



#endif /* _ASM_M32R_PTRACE_H */

arch/m32r/include/asm/setup.h

+1 −8
Original line number Diff line number Diff line 
#ifndef _ASM_M32R_SETUP_H

#define _ASM_M32R_SETUP_H



/*

 * This is set up by the setup-routine at boot-time

 */

#include <uapi/asm/setup.h>



#define COMMAND_LINE_SIZE       512



#ifdef __KERNEL__



#define PARAM			((unsigned char *)empty_zero_page)
@@ -33,6 +28,4 @@ 
extern unsigned long memory_start;

extern unsigned long memory_end;



#endif  /*  __KERNEL__  */



#endif /* _ASM_M32R_SETUP_H */

arch/m32r/include/asm/signal.h

+1 −122
Original line number Diff line number Diff line 
#ifndef _ASM_M32R_SIGNAL_H

#define _ASM_M32R_SIGNAL_H



#include <linux/types.h>

#include <linux/time.h>

#include <linux/compiler.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.  */
@@ -22,94 +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 sigaction {

	__sighandler_t sa_handler;

	unsigned long sa_flags;
@@ -120,35 +26,8 @@ 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>



#undef __HAVE_ARCH_SIG_BITOPS



#endif /* __KERNEL__ */



#endif  /* _ASM_M32R_SIGNAL_H */

arch/m32r/include/asm/termios.h

+1 −41
Original line number Diff line number Diff line 
#ifndef _M32R_TERMIOS_H

#define _M32R_TERMIOS_H



#include <asm/termbits.h>

#include <asm/ioctls.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__

#include <linux/module.h>

#include <uapi/asm/termios.h>



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

	eof=^D		vtime=\0	vmin=\1		sxtc=\0
@@ -86,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	/* _M32R_TERMIOS_H */