Commit 35bafbee authored by Ralf Baechle's avatar Ralf Baechle
Browse files

Merge tag 'disintegrate-mips-20121009' of... 

Merge tag 'disintegrate-mips-20121009' of git://git.infradead.org/users/dhowells/linux-headers into mips-for-linux-next

UAPI Disintegration 2012-10-09

Patchwork: https://patchwork.linux-mips.org/patch/4414/
parents 49a94e94 61730c53

arch/mips/include/asm/Kbuild

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



header-y += cachectl.h

header-y += sgidefs.h

header-y += sysmips.h

arch/mips/include/asm/errno.h

+1 −119
Original line number Original line Diff line number Diff line
@@ -8,128 +8,10 @@ 
#ifndef _ASM_ERRNO_H

#ifndef _ASM_ERRNO_H

#define _ASM_ERRNO_H

#define _ASM_ERRNO_H





/*

#include <uapi/asm/errno.h>

 * These error numbers are intended to be MIPS ABI compatible

 */



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



#define	ENOMSG		35	/* No message of desired type */

#define	EIDRM		36	/* Identifier removed */

#define	ECHRNG		37	/* Channel number out of range */

#define	EL2NSYNC	38	/* Level 2 not synchronized */

#define	EL3HLT		39	/* Level 3 halted */

#define	EL3RST		40	/* Level 3 reset */

#define	ELNRNG		41	/* Link number out of range */

#define	EUNATCH		42	/* Protocol driver not attached */

#define	ENOCSI		43	/* No CSI structure available */

#define	EL2HLT		44	/* Level 2 halted */

#define	EDEADLK		45	/* Resource deadlock would occur */

#define	ENOLCK		46	/* No record locks available */

#define	EBADE		50	/* Invalid exchange */

#define	EBADR		51	/* Invalid request descriptor */

#define	EXFULL		52	/* Exchange full */

#define	ENOANO		53	/* No anode */

#define	EBADRQC		54	/* Invalid request code */

#define	EBADSLT		55	/* Invalid slot */

#define	EDEADLOCK	56	/* File locking deadlock error */

#define	EBFONT		59	/* Bad font file format */

#define	ENOSTR		60	/* Device not a stream */

#define	ENODATA		61	/* No data available */

#define	ETIME		62	/* Timer expired */

#define	ENOSR		63	/* Out of streams resources */

#define	ENONET		64	/* Machine is not on the network */

#define	ENOPKG		65	/* Package not installed */

#define	EREMOTE		66	/* Object is remote */

#define	ENOLINK		67	/* Link has been severed */

#define	EADV		68	/* Advertise error */

#define	ESRMNT		69	/* Srmount error */

#define	ECOMM		70	/* Communication error on send */

#define	EPROTO		71	/* Protocol error */

#define	EDOTDOT		73	/* RFS specific error */

#define	EMULTIHOP	74	/* Multihop attempted */

#define	EBADMSG		77	/* Not a data message */

#define	ENAMETOOLONG	78	/* File name too long */

#define	EOVERFLOW	79	/* Value too large for defined data type */

#define	ENOTUNIQ	80	/* Name not unique on network */

#define	EBADFD		81	/* File descriptor in bad state */

#define	EREMCHG		82	/* Remote address changed */

#define	ELIBACC		83	/* Can not access a needed shared library */

#define	ELIBBAD		84	/* Accessing a corrupted shared library */

#define	ELIBSCN		85	/* .lib section in a.out corrupted */

#define	ELIBMAX		86	/* Attempting to link in too many shared libraries */

#define	ELIBEXEC	87	/* Cannot exec a shared library directly */

#define	EILSEQ		88	/* Illegal byte sequence */

#define	ENOSYS		89	/* Function not implemented */

#define	ELOOP		90	/* Too many symbolic links encountered */

#define	ERESTART	91	/* Interrupted system call should be restarted */

#define	ESTRPIPE	92	/* Streams pipe error */

#define	ENOTEMPTY	93	/* Directory not empty */

#define	EUSERS		94	/* Too many users */

#define	ENOTSOCK	95	/* Socket operation on non-socket */

#define	EDESTADDRREQ	96	/* Destination address required */

#define	EMSGSIZE	97	/* Message too long */

#define	EPROTOTYPE	98	/* Protocol wrong type for socket */

#define	ENOPROTOOPT	99	/* Protocol not available */

#define	EPROTONOSUPPORT	120	/* Protocol not supported */

#define	ESOCKTNOSUPPORT	121	/* Socket type not supported */

#define	EOPNOTSUPP	122	/* Operation not supported on transport endpoint */

#define	EPFNOSUPPORT	123	/* Protocol family not supported */

#define	EAFNOSUPPORT	124	/* Address family not supported by protocol */

#define	EADDRINUSE	125	/* Address already in use */

#define	EADDRNOTAVAIL	126	/* Cannot assign requested address */

#define	ENETDOWN	127	/* Network is down */

#define	ENETUNREACH	128	/* Network is unreachable */

#define	ENETRESET	129	/* Network dropped connection because of reset */

#define	ECONNABORTED	130	/* Software caused connection abort */

#define	ECONNRESET	131	/* Connection reset by peer */

#define	ENOBUFS		132	/* No buffer space available */

#define	EISCONN		133	/* Transport endpoint is already connected */

#define	ENOTCONN	134	/* Transport endpoint is not connected */

#define	EUCLEAN		135	/* Structure needs cleaning */

#define	ENOTNAM		137	/* Not a XENIX named type file */

#define	ENAVAIL		138	/* No XENIX semaphores available */

#define	EISNAM		139	/* Is a named type file */

#define	EREMOTEIO	140	/* Remote I/O error */

#define EINIT		141	/* Reserved */

#define EREMDEV		142	/* Error 142 */

#define	ESHUTDOWN	143	/* Cannot send after transport endpoint shutdown */

#define	ETOOMANYREFS	144	/* Too many references: cannot splice */

#define	ETIMEDOUT	145	/* Connection timed out */

#define	ECONNREFUSED	146	/* Connection refused */

#define	EHOSTDOWN	147	/* Host is down */

#define	EHOSTUNREACH	148	/* No route to host */

#define	EWOULDBLOCK	EAGAIN	/* Operation would block */

#define	EALREADY	149	/* Operation already in progress */

#define	EINPROGRESS	150	/* Operation now in progress */

#define	ESTALE		151	/* Stale NFS file handle */

#define ECANCELED	158	/* AIO operation canceled */



/*

 * These error are Linux extensions.

 */

#define ENOMEDIUM	159	/* No medium found */

#define EMEDIUMTYPE	160	/* Wrong medium type */

#define	ENOKEY		161	/* Required key not available */

#define	EKEYEXPIRED	162	/* Key has expired */

#define	EKEYREVOKED	163	/* Key has been revoked */

#define	EKEYREJECTED	164	/* Key was rejected by service */



/* for robust mutexes */

#define	EOWNERDEAD	165	/* Owner died */

#define	ENOTRECOVERABLE	166	/* State not recoverable */



#define	ERFKILL		167	/* Operation not possible due to RF-kill */





#define EHWPOISON	168	/* Memory page has hardware error */



#define EDQUOT		1133	/* Quota exceeded */



#ifdef __KERNEL__





/* The biggest error number defined here or in <linux/errno.h>. */

/* The biggest error number defined here or in <linux/errno.h>. */

#define EMAXERRNO	1133

#define EMAXERRNO	1133





#endif /* __KERNEL__ */



#endif /* _ASM_ERRNO_H */
 
#endif /* _ASM_ERRNO_H */

arch/mips/include/asm/ptrace.h

+1 −106
Original line number Original line Diff line number Diff line
@@ -9,115 +9,12 @@ 
#ifndef _ASM_PTRACE_H

#ifndef _ASM_PTRACE_H

#define _ASM_PTRACE_H

#define _ASM_PTRACE_H





/* 0 - 31 are integer registers, 32 - 63 are fp registers.  */

#define FPR_BASE	32

#define PC		64

#define CAUSE		65

#define BADVADDR	66

#define MMHI		67

#define MMLO		68

#define FPC_CSR		69

#define FPC_EIR		70

#define DSP_BASE	71		/* 3 more hi / lo register pairs */

#define DSP_CONTROL	77

#define ACX		78



/*

 * This struct defines the way the registers are stored on the stack during a

 * system call/exception. As usual the registers k0/k1 aren't being saved.

 */

struct pt_regs {

#ifdef CONFIG_32BIT

	/* Pad bytes for argument save space on the stack. */

	unsigned long pad0[6];

#endif



	/* Saved main processor registers. */

	unsigned long regs[32];



	/* Saved special registers. */

	unsigned long cp0_status;

	unsigned long hi;

	unsigned long lo;

#ifdef CONFIG_CPU_HAS_SMARTMIPS

	unsigned long acx;

#endif

	unsigned long cp0_badvaddr;

	unsigned long cp0_cause;

	unsigned long cp0_epc;

#ifdef CONFIG_MIPS_MT_SMTC

	unsigned long cp0_tcstatus;

#endif /* CONFIG_MIPS_MT_SMTC */

#ifdef CONFIG_CPU_CAVIUM_OCTEON

	unsigned long long mpl[3];        /* MTM{0,1,2} */

	unsigned long long mtp[3];        /* MTP{0,1,2} */

#endif

} __attribute__ ((aligned (8)));



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

/* #define PTRACE_SETFPXREGS		19 */



#define PTRACE_OLDSETOPTIONS	21



#define PTRACE_GET_THREAD_AREA	25

#define PTRACE_SET_THREAD_AREA	26



/* Calls to trace a 64bit program from a 32bit program.  */

#define PTRACE_PEEKTEXT_3264	0xc0

#define PTRACE_PEEKDATA_3264	0xc1

#define PTRACE_POKETEXT_3264	0xc2

#define PTRACE_POKEDATA_3264	0xc3

#define PTRACE_GET_THREAD_AREA_3264	0xc4



/* Read and write watchpoint registers.  */

enum pt_watch_style {

	pt_watch_style_mips32,

	pt_watch_style_mips64

};

struct mips32_watch_regs {

	unsigned int watchlo[8];

	/* Lower 16 bits of watchhi. */

	unsigned short watchhi[8];

	/* Valid mask and I R W bits.

	 * bit 0 -- 1 if W bit is usable.

	 * bit 1 -- 1 if R bit is usable.

	 * bit 2 -- 1 if I bit is usable.

	 * bits 3 - 11 -- Valid watchhi mask bits.

	 */

	unsigned short watch_masks[8];

	/* The number of valid watch register pairs.  */

	unsigned int num_valid;

} __attribute__((aligned(8)));



struct mips64_watch_regs {

	unsigned long long watchlo[8];

	unsigned short watchhi[8];

	unsigned short watch_masks[8];

	unsigned int num_valid;

} __attribute__((aligned(8)));



struct pt_watch_regs {

	enum pt_watch_style style;

	union {

		struct mips32_watch_regs mips32;

		struct mips64_watch_regs mips64;

	};

};



#define PTRACE_GET_WATCH_REGS	0xd0

#define PTRACE_SET_WATCH_REGS	0xd1



#ifdef __KERNEL__





#include <linux/compiler.h>

#include <linux/compiler.h>

#include <linux/linkage.h>

#include <linux/linkage.h>

#include <linux/types.h>

#include <linux/types.h>

#include <asm/isadep.h>

#include <asm/isadep.h>

#include <uapi/asm/ptrace.h>





struct task_struct;

struct task_struct;
@@ -164,6 +61,4 @@ static inline void die_if_kernel(const char *str, struct pt_regs *regs) 
		die(str, regs);

		die(str, regs);

}

}





#endif



#endif /* _ASM_PTRACE_H */
 
#endif /* _ASM_PTRACE_H */

arch/mips/include/asm/setup.h

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

#ifndef _MIPS_SETUP_H

#define _MIPS_SETUP_H

#define _MIPS_SETUP_H





#define COMMAND_LINE_SIZE	4096

#include <uapi/asm/setup.h>





#ifdef  __KERNEL__

extern void setup_early_printk(void);

extern void setup_early_printk(void);





extern void set_handler(unsigned long offset, void *addr, unsigned long len);

extern void set_handler(unsigned long offset, void *addr, unsigned long len);
@@ -17,6 +16,4 @@ extern unsigned long ebase; 
extern void per_cpu_trap_init(bool);

extern void per_cpu_trap_init(bool);

extern void cpu_cache_init(void);

extern void cpu_cache_init(void);





#endif /* __KERNEL__ */



#endif /* __SETUP_H */
 
#endif /* __SETUP_H */

arch/mips/include/asm/sigcontext.h

+1 −65
Original line number Original line Diff line number Diff line
@@ -9,71 +9,10 @@ 
#ifndef _ASM_SIGCONTEXT_H

#ifndef _ASM_SIGCONTEXT_H

#define _ASM_SIGCONTEXT_H

#define _ASM_SIGCONTEXT_H





#include <linux/types.h>

#include <uapi/asm/sigcontext.h>

#include <asm/sgidefs.h>



#if _MIPS_SIM == _MIPS_SIM_ABI32



/*

 * Keep this struct definition in sync with the sigcontext fragment

 * in arch/mips/tools/offset.c

 */

struct sigcontext {

	unsigned int		sc_regmask;	/* Unused */

	unsigned int		sc_status;	/* Unused */

	unsigned long long	sc_pc;

	unsigned long long	sc_regs[32];

	unsigned long long	sc_fpregs[32];

	unsigned int		sc_acx;		/* Was sc_ownedfp */

	unsigned int		sc_fpc_csr;

	unsigned int		sc_fpc_eir;	/* Unused */

	unsigned int		sc_used_math;

	unsigned int		sc_dsp;		/* dsp status, was sc_ssflags */

	unsigned long long	sc_mdhi;

	unsigned long long	sc_mdlo;

	unsigned long		sc_hi1;		/* Was sc_cause */

	unsigned long		sc_lo1;		/* Was sc_badvaddr */

	unsigned long		sc_hi2;		/* Was sc_sigset[4] */

	unsigned long		sc_lo2;

	unsigned long		sc_hi3;

	unsigned long		sc_lo3;

};



#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */





#if _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32

#if _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32





#include <linux/posix_types.h>

/*

 * Keep this struct definition in sync with the sigcontext fragment

 * in arch/mips/tools/offset.c

 *

 * Warning: this structure illdefined with sc_badvaddr being just an unsigned

 * int so it was changed to unsigned long in 2.6.0-test1.  This may break

 * binary compatibility - no prisoners.

 * DSP ASE in 2.6.12-rc4.  Turn sc_mdhi and sc_mdlo into an array of four

 * entries, add sc_dsp and sc_reserved for padding.  No prisoners.

 */

struct sigcontext {

	__u64	sc_regs[32];

	__u64	sc_fpregs[32];

	__u64	sc_mdhi;

	__u64	sc_hi1;

	__u64	sc_hi2;

	__u64	sc_hi3;

	__u64	sc_mdlo;

	__u64	sc_lo1;

	__u64	sc_lo2;

	__u64	sc_lo3;

	__u64	sc_pc;

	__u32	sc_fpc_csr;

	__u32	sc_used_math;

	__u32	sc_dsp;

	__u32	sc_reserved;

};



#ifdef __KERNEL__



struct sigcontext32 {

struct sigcontext32 {

	__u32		sc_regmask;	/* Unused */

	__u32		sc_regmask;	/* Unused */

	__u32		sc_status;	/* Unused */

	__u32		sc_status;	/* Unused */
@@ -94,8 +33,5 @@ struct sigcontext32 { 
	__u32		sc_hi3;

	__u32		sc_hi3;

	__u32		sc_lo3;

	__u32		sc_lo3;

};

};

#endif /* __KERNEL__ */



#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32 */

#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32 */



#endif /* _ASM_SIGCONTEXT_H */
 
#endif /* _ASM_SIGCONTEXT_H */