From d66d8c7187989cedae43cb349626a7f304c60ec6 Mon Sep 17 00:00:00 2001 From: David Howells Date: Thu, 20 Dec 2012 10:53:58 +0000 Subject: UAPI: (Scripted) Disintegrate arch/score/include/asm Signed-off-by: David Howells Acked-by: Arnd Bergmann Acked-by: Thomas Gleixner Acked-by: Michael Kerrisk Acked-by: Paul E. McKenney Acked-by: Dave Jones Acked-by: Lennox Wu Acked-by: Liqin Chen --- arch/score/include/asm/Kbuild | 1 - arch/score/include/asm/auxvec.h | 4 -- arch/score/include/asm/bitsperlong.h | 6 --- arch/score/include/asm/byteorder.h | 6 --- arch/score/include/asm/errno.h | 6 --- arch/score/include/asm/fcntl.h | 6 --- arch/score/include/asm/ioctl.h | 6 --- arch/score/include/asm/ioctls.h | 6 --- arch/score/include/asm/ipcbuf.h | 6 --- arch/score/include/asm/kvm_para.h | 1 - arch/score/include/asm/mman.h | 6 --- arch/score/include/asm/msgbuf.h | 6 --- arch/score/include/asm/param.h | 6 --- arch/score/include/asm/poll.h | 6 --- arch/score/include/asm/posix_types.h | 6 --- arch/score/include/asm/ptrace.h | 74 +----------------------------- arch/score/include/asm/resource.h | 6 --- arch/score/include/asm/sembuf.h | 6 --- arch/score/include/asm/setup.h | 7 +-- arch/score/include/asm/shmbuf.h | 6 --- arch/score/include/asm/sigcontext.h | 22 --------- arch/score/include/asm/siginfo.h | 6 --- arch/score/include/asm/signal.h | 6 --- arch/score/include/asm/socket.h | 6 --- arch/score/include/asm/sockios.h | 6 --- arch/score/include/asm/stat.h | 6 --- arch/score/include/asm/statfs.h | 6 --- arch/score/include/asm/swab.h | 6 --- arch/score/include/asm/termbits.h | 6 --- arch/score/include/asm/termios.h | 6 --- arch/score/include/asm/types.h | 6 --- arch/score/include/asm/unistd.h | 12 ----- arch/score/include/uapi/asm/Kbuild | 31 +++++++++++++ arch/score/include/uapi/asm/auxvec.h | 4 ++ arch/score/include/uapi/asm/bitsperlong.h | 6 +++ arch/score/include/uapi/asm/byteorder.h | 6 +++ arch/score/include/uapi/asm/errno.h | 6 +++ arch/score/include/uapi/asm/fcntl.h | 6 +++ arch/score/include/uapi/asm/ioctl.h | 6 +++ arch/score/include/uapi/asm/ioctls.h | 6 +++ arch/score/include/uapi/asm/ipcbuf.h | 6 +++ arch/score/include/uapi/asm/kvm_para.h | 1 + arch/score/include/uapi/asm/mman.h | 6 +++ arch/score/include/uapi/asm/msgbuf.h | 6 +++ arch/score/include/uapi/asm/param.h | 6 +++ arch/score/include/uapi/asm/poll.h | 6 +++ arch/score/include/uapi/asm/posix_types.h | 6 +++ arch/score/include/uapi/asm/ptrace.h | 76 +++++++++++++++++++++++++++++++ arch/score/include/uapi/asm/resource.h | 6 +++ arch/score/include/uapi/asm/sembuf.h | 6 +++ arch/score/include/uapi/asm/setup.h | 9 ++++ arch/score/include/uapi/asm/shmbuf.h | 6 +++ arch/score/include/uapi/asm/sigcontext.h | 22 +++++++++ arch/score/include/uapi/asm/siginfo.h | 6 +++ arch/score/include/uapi/asm/signal.h | 6 +++ arch/score/include/uapi/asm/socket.h | 6 +++ arch/score/include/uapi/asm/sockios.h | 6 +++ arch/score/include/uapi/asm/stat.h | 6 +++ arch/score/include/uapi/asm/statfs.h | 6 +++ arch/score/include/uapi/asm/swab.h | 6 +++ arch/score/include/uapi/asm/termbits.h | 6 +++ arch/score/include/uapi/asm/termios.h | 6 +++ arch/score/include/uapi/asm/types.h | 6 +++ arch/score/include/uapi/asm/unistd.h | 12 +++++ 64 files changed, 307 insertions(+), 269 deletions(-) delete mode 100644 arch/score/include/asm/auxvec.h delete mode 100644 arch/score/include/asm/bitsperlong.h delete mode 100644 arch/score/include/asm/byteorder.h delete mode 100644 arch/score/include/asm/errno.h delete mode 100644 arch/score/include/asm/fcntl.h delete mode 100644 arch/score/include/asm/ioctl.h delete mode 100644 arch/score/include/asm/ioctls.h delete mode 100644 arch/score/include/asm/ipcbuf.h delete mode 100644 arch/score/include/asm/kvm_para.h delete mode 100644 arch/score/include/asm/mman.h delete mode 100644 arch/score/include/asm/msgbuf.h delete mode 100644 arch/score/include/asm/param.h delete mode 100644 arch/score/include/asm/poll.h delete mode 100644 arch/score/include/asm/posix_types.h delete mode 100644 arch/score/include/asm/resource.h delete mode 100644 arch/score/include/asm/sembuf.h delete mode 100644 arch/score/include/asm/shmbuf.h delete mode 100644 arch/score/include/asm/sigcontext.h delete mode 100644 arch/score/include/asm/siginfo.h delete mode 100644 arch/score/include/asm/signal.h delete mode 100644 arch/score/include/asm/socket.h delete mode 100644 arch/score/include/asm/sockios.h delete mode 100644 arch/score/include/asm/stat.h delete mode 100644 arch/score/include/asm/statfs.h delete mode 100644 arch/score/include/asm/swab.h delete mode 100644 arch/score/include/asm/termbits.h delete mode 100644 arch/score/include/asm/termios.h delete mode 100644 arch/score/include/asm/types.h delete mode 100644 arch/score/include/asm/unistd.h create mode 100644 arch/score/include/uapi/asm/auxvec.h create mode 100644 arch/score/include/uapi/asm/bitsperlong.h create mode 100644 arch/score/include/uapi/asm/byteorder.h create mode 100644 arch/score/include/uapi/asm/errno.h create mode 100644 arch/score/include/uapi/asm/fcntl.h create mode 100644 arch/score/include/uapi/asm/ioctl.h create mode 100644 arch/score/include/uapi/asm/ioctls.h create mode 100644 arch/score/include/uapi/asm/ipcbuf.h create mode 100644 arch/score/include/uapi/asm/kvm_para.h create mode 100644 arch/score/include/uapi/asm/mman.h create mode 100644 arch/score/include/uapi/asm/msgbuf.h create mode 100644 arch/score/include/uapi/asm/param.h create mode 100644 arch/score/include/uapi/asm/poll.h create mode 100644 arch/score/include/uapi/asm/posix_types.h create mode 100644 arch/score/include/uapi/asm/ptrace.h create mode 100644 arch/score/include/uapi/asm/resource.h create mode 100644 arch/score/include/uapi/asm/sembuf.h create mode 100644 arch/score/include/uapi/asm/setup.h create mode 100644 arch/score/include/uapi/asm/shmbuf.h create mode 100644 arch/score/include/uapi/asm/sigcontext.h create mode 100644 arch/score/include/uapi/asm/siginfo.h create mode 100644 arch/score/include/uapi/asm/signal.h create mode 100644 arch/score/include/uapi/asm/socket.h create mode 100644 arch/score/include/uapi/asm/sockios.h create mode 100644 arch/score/include/uapi/asm/stat.h create mode 100644 arch/score/include/uapi/asm/statfs.h create mode 100644 arch/score/include/uapi/asm/swab.h create mode 100644 arch/score/include/uapi/asm/termbits.h create mode 100644 arch/score/include/uapi/asm/termios.h create mode 100644 arch/score/include/uapi/asm/types.h create mode 100644 arch/score/include/uapi/asm/unistd.h (limited to 'arch') diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index 16e41fe1a41..cebaff8069a 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,4 +1,3 @@ -include include/asm-generic/Kbuild.asm header-y += diff --git a/arch/score/include/asm/auxvec.h b/arch/score/include/asm/auxvec.h deleted file mode 100644 index f69151565ae..00000000000 --- a/arch/score/include/asm/auxvec.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef _ASM_SCORE_AUXVEC_H -#define _ASM_SCORE_AUXVEC_H - -#endif /* _ASM_SCORE_AUXVEC_H */ diff --git a/arch/score/include/asm/bitsperlong.h b/arch/score/include/asm/bitsperlong.h deleted file mode 100644 index 86ff337aa45..00000000000 --- a/arch/score/include/asm/bitsperlong.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_BITSPERLONG_H -#define _ASM_SCORE_BITSPERLONG_H - -#include - -#endif /* _ASM_SCORE_BITSPERLONG_H */ diff --git a/arch/score/include/asm/byteorder.h b/arch/score/include/asm/byteorder.h deleted file mode 100644 index 88cbebc7921..00000000000 --- a/arch/score/include/asm/byteorder.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_BYTEORDER_H -#define _ASM_SCORE_BYTEORDER_H - -#include - -#endif /* _ASM_SCORE_BYTEORDER_H */ diff --git a/arch/score/include/asm/errno.h b/arch/score/include/asm/errno.h deleted file mode 100644 index 29ff39d5ab4..00000000000 --- a/arch/score/include/asm/errno.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_ERRNO_H -#define _ASM_SCORE_ERRNO_H - -#include - -#endif /* _ASM_SCORE_ERRNO_H */ diff --git a/arch/score/include/asm/fcntl.h b/arch/score/include/asm/fcntl.h deleted file mode 100644 index 03968a3103a..00000000000 --- a/arch/score/include/asm/fcntl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_FCNTL_H -#define _ASM_SCORE_FCNTL_H - -#include - -#endif /* _ASM_SCORE_FCNTL_H */ diff --git a/arch/score/include/asm/ioctl.h b/arch/score/include/asm/ioctl.h deleted file mode 100644 index a351d2194bf..00000000000 --- a/arch/score/include/asm/ioctl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_IOCTL_H -#define _ASM_SCORE_IOCTL_H - -#include - -#endif /* _ASM_SCORE_IOCTL_H */ diff --git a/arch/score/include/asm/ioctls.h b/arch/score/include/asm/ioctls.h deleted file mode 100644 index ed01d2b9aea..00000000000 --- a/arch/score/include/asm/ioctls.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_IOCTLS_H -#define _ASM_SCORE_IOCTLS_H - -#include - -#endif /* _ASM_SCORE_IOCTLS_H */ diff --git a/arch/score/include/asm/ipcbuf.h b/arch/score/include/asm/ipcbuf.h deleted file mode 100644 index e082ceff181..00000000000 --- a/arch/score/include/asm/ipcbuf.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_IPCBUF_H -#define _ASM_SCORE_IPCBUF_H - -#include - -#endif /* _ASM_SCORE_IPCBUF_H */ diff --git a/arch/score/include/asm/kvm_para.h b/arch/score/include/asm/kvm_para.h deleted file mode 100644 index 14fab8f0b95..00000000000 --- a/arch/score/include/asm/kvm_para.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/score/include/asm/mman.h b/arch/score/include/asm/mman.h deleted file mode 100644 index 84d85ddfed8..00000000000 --- a/arch/score/include/asm/mman.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_MMAN_H -#define _ASM_SCORE_MMAN_H - -#include - -#endif /* _ASM_SCORE_MMAN_H */ diff --git a/arch/score/include/asm/msgbuf.h b/arch/score/include/asm/msgbuf.h deleted file mode 100644 index 7506721e29f..00000000000 --- a/arch/score/include/asm/msgbuf.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_MSGBUF_H -#define _ASM_SCORE_MSGBUF_H - -#include - -#endif /* _ASM_SCORE_MSGBUF_H */ diff --git a/arch/score/include/asm/param.h b/arch/score/include/asm/param.h deleted file mode 100644 index 916b8690b6a..00000000000 --- a/arch/score/include/asm/param.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_PARAM_H -#define _ASM_SCORE_PARAM_H - -#include - -#endif /* _ASM_SCORE_PARAM_H */ diff --git a/arch/score/include/asm/poll.h b/arch/score/include/asm/poll.h deleted file mode 100644 index 18532db0286..00000000000 --- a/arch/score/include/asm/poll.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_POLL_H -#define _ASM_SCORE_POLL_H - -#include - -#endif /* _ASM_SCORE_POLL_H */ diff --git a/arch/score/include/asm/posix_types.h b/arch/score/include/asm/posix_types.h deleted file mode 100644 index b88acf80048..00000000000 --- a/arch/score/include/asm/posix_types.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_POSIX_TYPES_H -#define _ASM_SCORE_POSIX_TYPES_H - -#include - -#endif /* _ASM_SCORE_POSIX_TYPES_H */ diff --git a/arch/score/include/asm/ptrace.h b/arch/score/include/asm/ptrace.h index e89dc9b1ef4..78fc538db84 100644 --- a/arch/score/include/asm/ptrace.h +++ b/arch/score/include/asm/ptrace.h @@ -1,78 +1,8 @@ #ifndef _ASM_SCORE_PTRACE_H #define _ASM_SCORE_PTRACE_H -#define PTRACE_GETREGS 12 -#define PTRACE_SETREGS 13 +#include -#define PC 32 -#define CONDITION 33 -#define ECR 34 -#define EMA 35 -#define CEH 36 -#define CEL 37 -#define COUNTER 38 -#define LDCR 39 -#define STCR 40 -#define PSR 41 - -#define SINGLESTEP16_INSN 0x7006 -#define SINGLESTEP32_INSN 0x840C8000 -#define BREAKPOINT16_INSN 0x7002 /* work on SPG300 */ -#define BREAKPOINT32_INSN 0x84048000 /* work on SPG300 */ - -/* Define instruction mask */ -#define INSN32_MASK 0x80008000 - -#define J32 0x88008000 /* 1_00010_0000000000_1_000000000000000 */ -#define J32M 0xFC008000 /* 1_11111_0000000000_1_000000000000000 */ - -#define B32 0x90008000 /* 1_00100_0000000000_1_000000000000000 */ -#define B32M 0xFC008000 -#define BL32 0x90008001 /* 1_00100_0000000000_1_000000000000001 */ -#define BL32M B32 -#define BR32 0x80008008 /* 1_00000_0000000000_1_00000000_000100_0 */ -#define BR32M 0xFFE0807E -#define BRL32 0x80008009 /* 1_00000_0000000000_1_00000000_000100_1 */ -#define BRL32M BR32M - -#define B32_SET (J32 | B32 | BL32 | BR32 | BRL32) - -#define J16 0x3000 /* 0_011_....... */ -#define J16M 0xF000 -#define B16 0x4000 /* 0_100_....... */ -#define B16M 0xF000 -#define BR16 0x0004 /* 0_000.......0100 */ -#define BR16M 0xF00F -#define B16_SET (J16 | B16 | BR16) - - -/* - * 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 { - unsigned long pad0[6]; /* stack arguments */ - unsigned long orig_r4; - unsigned long orig_r7; - long is_syscall; - - unsigned long regs[32]; - - unsigned long cel; - unsigned long ceh; - - unsigned long sr0; /* cnt */ - unsigned long sr1; /* lcr */ - unsigned long sr2; /* scr */ - - unsigned long cp0_epc; - unsigned long cp0_ema; - unsigned long cp0_psr; - unsigned long cp0_ecr; - unsigned long cp0_condition; -}; - -#ifdef __KERNEL__ struct task_struct; @@ -91,6 +21,4 @@ extern int read_tsk_short(struct task_struct *, unsigned long, #define arch_has_single_step() (1) -#endif /* __KERNEL__ */ - #endif /* _ASM_SCORE_PTRACE_H */ diff --git a/arch/score/include/asm/resource.h b/arch/score/include/asm/resource.h deleted file mode 100644 index 9ce22bc7b47..00000000000 --- a/arch/score/include/asm/resource.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_RESOURCE_H -#define _ASM_SCORE_RESOURCE_H - -#include - -#endif /* _ASM_SCORE_RESOURCE_H */ diff --git a/arch/score/include/asm/sembuf.h b/arch/score/include/asm/sembuf.h deleted file mode 100644 index dae5e835ce9..00000000000 --- a/arch/score/include/asm/sembuf.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_SEMBUF_H -#define _ASM_SCORE_SEMBUF_H - -#include - -#endif /* _ASM_SCORE_SEMBUF_H */ diff --git a/arch/score/include/asm/setup.h b/arch/score/include/asm/setup.h index 3cb944dc68d..1f3aa7262fa 100644 --- a/arch/score/include/asm/setup.h +++ b/arch/score/include/asm/setup.h @@ -1,11 +1,8 @@ #ifndef _ASM_SCORE_SETUP_H #define _ASM_SCORE_SETUP_H -#define COMMAND_LINE_SIZE 256 -#define MEMORY_START 0 -#define MEMORY_SIZE 0x2000000 +#include -#ifdef __KERNEL__ extern void pagetable_init(void); extern void pgd_init(unsigned long page); @@ -36,6 +33,4 @@ extern void debug_exception_vector(void); extern void general_exception_vector(void); extern void interrupt_exception_vector(void); -#endif /* __KERNEL__ */ - #endif /* _ASM_SCORE_SETUP_H */ diff --git a/arch/score/include/asm/shmbuf.h b/arch/score/include/asm/shmbuf.h deleted file mode 100644 index c85b2429ba2..00000000000 --- a/arch/score/include/asm/shmbuf.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_SHMBUF_H -#define _ASM_SCORE_SHMBUF_H - -#include - -#endif /* _ASM_SCORE_SHMBUF_H */ diff --git a/arch/score/include/asm/sigcontext.h b/arch/score/include/asm/sigcontext.h deleted file mode 100644 index 5ffda39ddb9..00000000000 --- a/arch/score/include/asm/sigcontext.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef _ASM_SCORE_SIGCONTEXT_H -#define _ASM_SCORE_SIGCONTEXT_H - -/* - * Keep this struct definition in sync with the sigcontext fragment - * in arch/score/tools/offset.c - */ -struct sigcontext { - unsigned int sc_regmask; - unsigned int sc_psr; - unsigned int sc_condition; - unsigned long sc_pc; - unsigned long sc_regs[32]; - unsigned int sc_ssflags; - unsigned int sc_mdceh; - unsigned int sc_mdcel; - unsigned int sc_ecr; - unsigned long sc_ema; - unsigned long sc_sigset[4]; -}; - -#endif /* _ASM_SCORE_SIGCONTEXT_H */ diff --git a/arch/score/include/asm/siginfo.h b/arch/score/include/asm/siginfo.h deleted file mode 100644 index 87ca35607a2..00000000000 --- a/arch/score/include/asm/siginfo.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_SIGINFO_H -#define _ASM_SCORE_SIGINFO_H - -#include - -#endif /* _ASM_SCORE_SIGINFO_H */ diff --git a/arch/score/include/asm/signal.h b/arch/score/include/asm/signal.h deleted file mode 100644 index 2605bc06b64..00000000000 --- a/arch/score/include/asm/signal.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_SIGNAL_H -#define _ASM_SCORE_SIGNAL_H - -#include - -#endif /* _ASM_SCORE_SIGNAL_H */ diff --git a/arch/score/include/asm/socket.h b/arch/score/include/asm/socket.h deleted file mode 100644 index 612a70e385b..00000000000 --- a/arch/score/include/asm/socket.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_SOCKET_H -#define _ASM_SCORE_SOCKET_H - -#include - -#endif /* _ASM_SCORE_SOCKET_H */ diff --git a/arch/score/include/asm/sockios.h b/arch/score/include/asm/sockios.h deleted file mode 100644 index ba825648018..00000000000 --- a/arch/score/include/asm/sockios.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_SOCKIOS_H -#define _ASM_SCORE_SOCKIOS_H - -#include - -#endif /* _ASM_SCORE_SOCKIOS_H */ diff --git a/arch/score/include/asm/stat.h b/arch/score/include/asm/stat.h deleted file mode 100644 index 5037055500a..00000000000 --- a/arch/score/include/asm/stat.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_STAT_H -#define _ASM_SCORE_STAT_H - -#include - -#endif /* _ASM_SCORE_STAT_H */ diff --git a/arch/score/include/asm/statfs.h b/arch/score/include/asm/statfs.h deleted file mode 100644 index 36e41004e99..00000000000 --- a/arch/score/include/asm/statfs.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_STATFS_H -#define _ASM_SCORE_STATFS_H - -#include - -#endif /* _ASM_SCORE_STATFS_H */ diff --git a/arch/score/include/asm/swab.h b/arch/score/include/asm/swab.h deleted file mode 100644 index fadc3cc6d8a..00000000000 --- a/arch/score/include/asm/swab.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_SWAB_H -#define _ASM_SCORE_SWAB_H - -#include - -#endif /* _ASM_SCORE_SWAB_H */ diff --git a/arch/score/include/asm/termbits.h b/arch/score/include/asm/termbits.h deleted file mode 100644 index 9a95c141243..00000000000 --- a/arch/score/include/asm/termbits.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_TERMBITS_H -#define _ASM_SCORE_TERMBITS_H - -#include - -#endif /* _ASM_SCORE_TERMBITS_H */ diff --git a/arch/score/include/asm/termios.h b/arch/score/include/asm/termios.h deleted file mode 100644 index 40984e811ad..00000000000 --- a/arch/score/include/asm/termios.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_TERMIOS_H -#define _ASM_SCORE_TERMIOS_H - -#include - -#endif /* _ASM_SCORE_TERMIOS_H */ diff --git a/arch/score/include/asm/types.h b/arch/score/include/asm/types.h deleted file mode 100644 index 2140032778e..00000000000 --- a/arch/score/include/asm/types.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_TYPES_H -#define _ASM_SCORE_TYPES_H - -#include - -#endif /* _ASM_SCORE_TYPES_H */ diff --git a/arch/score/include/asm/unistd.h b/arch/score/include/asm/unistd.h deleted file mode 100644 index 56001c93095..00000000000 --- a/arch/score/include/asm/unistd.h +++ /dev/null @@ -1,12 +0,0 @@ -#define __ARCH_HAVE_MMU - -#define __ARCH_WANT_SYSCALL_NO_AT -#define __ARCH_WANT_SYSCALL_NO_FLAGS -#define __ARCH_WANT_SYSCALL_OFF_T -#define __ARCH_WANT_SYSCALL_DEPRECATED -#define __ARCH_WANT_SYS_EXECVE -#define __ARCH_WANT_SYS_CLONE -#define __ARCH_WANT_SYS_FORK -#define __ARCH_WANT_SYS_VFORK - -#include diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index baebb3da1d4..040178cdb3e 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild @@ -1,3 +1,34 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm +header-y += auxvec.h +header-y += bitsperlong.h +header-y += byteorder.h +header-y += errno.h +header-y += fcntl.h +header-y += ioctl.h +header-y += ioctls.h +header-y += ipcbuf.h +header-y += kvm_para.h +header-y += mman.h +header-y += msgbuf.h +header-y += param.h +header-y += poll.h +header-y += posix_types.h +header-y += ptrace.h +header-y += resource.h +header-y += sembuf.h +header-y += setup.h +header-y += shmbuf.h +header-y += sigcontext.h +header-y += siginfo.h +header-y += signal.h +header-y += socket.h +header-y += sockios.h +header-y += stat.h +header-y += statfs.h +header-y += swab.h +header-y += termbits.h +header-y += termios.h +header-y += types.h +header-y += unistd.h diff --git a/arch/score/include/uapi/asm/auxvec.h b/arch/score/include/uapi/asm/auxvec.h new file mode 100644 index 00000000000..f69151565ae --- /dev/null +++ b/arch/score/include/uapi/asm/auxvec.h @@ -0,0 +1,4 @@ +#ifndef _ASM_SCORE_AUXVEC_H +#define _ASM_SCORE_AUXVEC_H + +#endif /* _ASM_SCORE_AUXVEC_H */ diff --git a/arch/score/include/uapi/asm/bitsperlong.h b/arch/score/include/uapi/asm/bitsperlong.h new file mode 100644 index 00000000000..86ff337aa45 --- /dev/null +++ b/arch/score/include/uapi/asm/bitsperlong.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_BITSPERLONG_H +#define _ASM_SCORE_BITSPERLONG_H + +#include + +#endif /* _ASM_SCORE_BITSPERLONG_H */ diff --git a/arch/score/include/uapi/asm/byteorder.h b/arch/score/include/uapi/asm/byteorder.h new file mode 100644 index 00000000000..88cbebc7921 --- /dev/null +++ b/arch/score/include/uapi/asm/byteorder.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_BYTEORDER_H +#define _ASM_SCORE_BYTEORDER_H + +#include + +#endif /* _ASM_SCORE_BYTEORDER_H */ diff --git a/arch/score/include/uapi/asm/errno.h b/arch/score/include/uapi/asm/errno.h new file mode 100644 index 00000000000..29ff39d5ab4 --- /dev/null +++ b/arch/score/include/uapi/asm/errno.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_ERRNO_H +#define _ASM_SCORE_ERRNO_H + +#include + +#endif /* _ASM_SCORE_ERRNO_H */ diff --git a/arch/score/include/uapi/asm/fcntl.h b/arch/score/include/uapi/asm/fcntl.h new file mode 100644 index 00000000000..03968a3103a --- /dev/null +++ b/arch/score/include/uapi/asm/fcntl.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_FCNTL_H +#define _ASM_SCORE_FCNTL_H + +#include + +#endif /* _ASM_SCORE_FCNTL_H */ diff --git a/arch/score/include/uapi/asm/ioctl.h b/arch/score/include/uapi/asm/ioctl.h new file mode 100644 index 00000000000..a351d2194bf --- /dev/null +++ b/arch/score/include/uapi/asm/ioctl.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_IOCTL_H +#define _ASM_SCORE_IOCTL_H + +#include + +#endif /* _ASM_SCORE_IOCTL_H */ diff --git a/arch/score/include/uapi/asm/ioctls.h b/arch/score/include/uapi/asm/ioctls.h new file mode 100644 index 00000000000..ed01d2b9aea --- /dev/null +++ b/arch/score/include/uapi/asm/ioctls.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_IOCTLS_H +#define _ASM_SCORE_IOCTLS_H + +#include + +#endif /* _ASM_SCORE_IOCTLS_H */ diff --git a/arch/score/include/uapi/asm/ipcbuf.h b/arch/score/include/uapi/asm/ipcbuf.h new file mode 100644 index 00000000000..e082ceff181 --- /dev/null +++ b/arch/score/include/uapi/asm/ipcbuf.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_IPCBUF_H +#define _ASM_SCORE_IPCBUF_H + +#include + +#endif /* _ASM_SCORE_IPCBUF_H */ diff --git a/arch/score/include/uapi/asm/kvm_para.h b/arch/score/include/uapi/asm/kvm_para.h new file mode 100644 index 00000000000..14fab8f0b95 --- /dev/null +++ b/arch/score/include/uapi/asm/kvm_para.h @@ -0,0 +1 @@ +#include diff --git a/arch/score/include/uapi/asm/mman.h b/arch/score/include/uapi/asm/mman.h new file mode 100644 index 00000000000..84d85ddfed8 --- /dev/null +++ b/arch/score/include/uapi/asm/mman.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_MMAN_H +#define _ASM_SCORE_MMAN_H + +#include + +#endif /* _ASM_SCORE_MMAN_H */ diff --git a/arch/score/include/uapi/asm/msgbuf.h b/arch/score/include/uapi/asm/msgbuf.h new file mode 100644 index 00000000000..7506721e29f --- /dev/null +++ b/arch/score/include/uapi/asm/msgbuf.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_MSGBUF_H +#define _ASM_SCORE_MSGBUF_H + +#include + +#endif /* _ASM_SCORE_MSGBUF_H */ diff --git a/arch/score/include/uapi/asm/param.h b/arch/score/include/uapi/asm/param.h new file mode 100644 index 00000000000..916b8690b6a --- /dev/null +++ b/arch/score/include/uapi/asm/param.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_PARAM_H +#define _ASM_SCORE_PARAM_H + +#include + +#endif /* _ASM_SCORE_PARAM_H */ diff --git a/arch/score/include/uapi/asm/poll.h b/arch/score/include/uapi/asm/poll.h new file mode 100644 index 00000000000..18532db0286 --- /dev/null +++ b/arch/score/include/uapi/asm/poll.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_POLL_H +#define _ASM_SCORE_POLL_H + +#include + +#endif /* _ASM_SCORE_POLL_H */ diff --git a/arch/score/include/uapi/asm/posix_types.h b/arch/score/include/uapi/asm/posix_types.h new file mode 100644 index 00000000000..b88acf80048 --- /dev/null +++ b/arch/score/include/uapi/asm/posix_types.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_POSIX_TYPES_H +#define _ASM_SCORE_POSIX_TYPES_H + +#include + +#endif /* _ASM_SCORE_POSIX_TYPES_H */ diff --git a/arch/score/include/uapi/asm/ptrace.h b/arch/score/include/uapi/asm/ptrace.h new file mode 100644 index 00000000000..f59771a3f12 --- /dev/null +++ b/arch/score/include/uapi/asm/ptrace.h @@ -0,0 +1,76 @@ +#ifndef _UAPI_ASM_SCORE_PTRACE_H +#define _UAPI_ASM_SCORE_PTRACE_H + +#define PTRACE_GETREGS 12 +#define PTRACE_SETREGS 13 + +#define PC 32 +#define CONDITION 33 +#define ECR 34 +#define EMA 35 +#define CEH 36 +#define CEL 37 +#define COUNTER 38 +#define LDCR 39 +#define STCR 40 +#define PSR 41 + +#define SINGLESTEP16_INSN 0x7006 +#define SINGLESTEP32_INSN 0x840C8000 +#define BREAKPOINT16_INSN 0x7002 /* work on SPG300 */ +#define BREAKPOINT32_INSN 0x84048000 /* work on SPG300 */ + +/* Define instruction mask */ +#define INSN32_MASK 0x80008000 + +#define J32 0x88008000 /* 1_00010_0000000000_1_000000000000000 */ +#define J32M 0xFC008000 /* 1_11111_0000000000_1_000000000000000 */ + +#define B32 0x90008000 /* 1_00100_0000000000_1_000000000000000 */ +#define B32M 0xFC008000 +#define BL32 0x90008001 /* 1_00100_0000000000_1_000000000000001 */ +#define BL32M B32 +#define BR32 0x80008008 /* 1_00000_0000000000_1_00000000_000100_0 */ +#define BR32M 0xFFE0807E +#define BRL32 0x80008009 /* 1_00000_0000000000_1_00000000_000100_1 */ +#define BRL32M BR32M + +#define B32_SET (J32 | B32 | BL32 | BR32 | BRL32) + +#define J16 0x3000 /* 0_011_....... */ +#define J16M 0xF000 +#define B16 0x4000 /* 0_100_....... */ +#define B16M 0xF000 +#define BR16 0x0004 /* 0_000.......0100 */ +#define BR16M 0xF00F +#define B16_SET (J16 | B16 | BR16) + + +/* + * 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 { + unsigned long pad0[6]; /* stack arguments */ + unsigned long orig_r4; + unsigned long orig_r7; + long is_syscall; + + unsigned long regs[32]; + + unsigned long cel; + unsigned long ceh; + + unsigned long sr0; /* cnt */ + unsigned long sr1; /* lcr */ + unsigned long sr2; /* scr */ + + unsigned long cp0_epc; + unsigned long cp0_ema; + unsigned long cp0_psr; + unsigned long cp0_ecr; + unsigned long cp0_condition; +}; + + +#endif /* _UAPI_ASM_SCORE_PTRACE_H */ diff --git a/arch/score/include/uapi/asm/resource.h b/arch/score/include/uapi/asm/resource.h new file mode 100644 index 00000000000..9ce22bc7b47 --- /dev/null +++ b/arch/score/include/uapi/asm/resource.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_RESOURCE_H +#define _ASM_SCORE_RESOURCE_H + +#include + +#endif /* _ASM_SCORE_RESOURCE_H */ diff --git a/arch/score/include/uapi/asm/sembuf.h b/arch/score/include/uapi/asm/sembuf.h new file mode 100644 index 00000000000..dae5e835ce9 --- /dev/null +++ b/arch/score/include/uapi/asm/sembuf.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_SEMBUF_H +#define _ASM_SCORE_SEMBUF_H + +#include + +#endif /* _ASM_SCORE_SEMBUF_H */ diff --git a/arch/score/include/uapi/asm/setup.h b/arch/score/include/uapi/asm/setup.h new file mode 100644 index 00000000000..ab9dbdb59bb --- /dev/null +++ b/arch/score/include/uapi/asm/setup.h @@ -0,0 +1,9 @@ +#ifndef _UAPI_ASM_SCORE_SETUP_H +#define _UAPI_ASM_SCORE_SETUP_H + +#define COMMAND_LINE_SIZE 256 +#define MEMORY_START 0 +#define MEMORY_SIZE 0x2000000 + + +#endif /* _UAPI_ASM_SCORE_SETUP_H */ diff --git a/arch/score/include/uapi/asm/shmbuf.h b/arch/score/include/uapi/asm/shmbuf.h new file mode 100644 index 00000000000..c85b2429ba2 --- /dev/null +++ b/arch/score/include/uapi/asm/shmbuf.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_SHMBUF_H +#define _ASM_SCORE_SHMBUF_H + +#include + +#endif /* _ASM_SCORE_SHMBUF_H */ diff --git a/arch/score/include/uapi/asm/sigcontext.h b/arch/score/include/uapi/asm/sigcontext.h new file mode 100644 index 00000000000..5ffda39ddb9 --- /dev/null +++ b/arch/score/include/uapi/asm/sigcontext.h @@ -0,0 +1,22 @@ +#ifndef _ASM_SCORE_SIGCONTEXT_H +#define _ASM_SCORE_SIGCONTEXT_H + +/* + * Keep this struct definition in sync with the sigcontext fragment + * in arch/score/tools/offset.c + */ +struct sigcontext { + unsigned int sc_regmask; + unsigned int sc_psr; + unsigned int sc_condition; + unsigned long sc_pc; + unsigned long sc_regs[32]; + unsigned int sc_ssflags; + unsigned int sc_mdceh; + unsigned int sc_mdcel; + unsigned int sc_ecr; + unsigned long sc_ema; + unsigned long sc_sigset[4]; +}; + +#endif /* _ASM_SCORE_SIGCONTEXT_H */ diff --git a/arch/score/include/uapi/asm/siginfo.h b/arch/score/include/uapi/asm/siginfo.h new file mode 100644 index 00000000000..87ca35607a2 --- /dev/null +++ b/arch/score/include/uapi/asm/siginfo.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_SIGINFO_H +#define _ASM_SCORE_SIGINFO_H + +#include + +#endif /* _ASM_SCORE_SIGINFO_H */ diff --git a/arch/score/include/uapi/asm/signal.h b/arch/score/include/uapi/asm/signal.h new file mode 100644 index 00000000000..2605bc06b64 --- /dev/null +++ b/arch/score/include/uapi/asm/signal.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_SIGNAL_H +#define _ASM_SCORE_SIGNAL_H + +#include + +#endif /* _ASM_SCORE_SIGNAL_H */ diff --git a/arch/score/include/uapi/asm/socket.h b/arch/score/include/uapi/asm/socket.h new file mode 100644 index 00000000000..612a70e385b --- /dev/null +++ b/arch/score/include/uapi/asm/socket.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_SOCKET_H +#define _ASM_SCORE_SOCKET_H + +#include + +#endif /* _ASM_SCORE_SOCKET_H */ diff --git a/arch/score/include/uapi/asm/sockios.h b/arch/score/include/uapi/asm/sockios.h new file mode 100644 index 00000000000..ba825648018 --- /dev/null +++ b/arch/score/include/uapi/asm/sockios.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_SOCKIOS_H +#define _ASM_SCORE_SOCKIOS_H + +#include + +#endif /* _ASM_SCORE_SOCKIOS_H */ diff --git a/arch/score/include/uapi/asm/stat.h b/arch/score/include/uapi/asm/stat.h new file mode 100644 index 00000000000..5037055500a --- /dev/null +++ b/arch/score/include/uapi/asm/stat.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_STAT_H +#define _ASM_SCORE_STAT_H + +#include + +#endif /* _ASM_SCORE_STAT_H */ diff --git a/arch/score/include/uapi/asm/statfs.h b/arch/score/include/uapi/asm/statfs.h new file mode 100644 index 00000000000..36e41004e99 --- /dev/null +++ b/arch/score/include/uapi/asm/statfs.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_STATFS_H +#define _ASM_SCORE_STATFS_H + +#include + +#endif /* _ASM_SCORE_STATFS_H */ diff --git a/arch/score/include/uapi/asm/swab.h b/arch/score/include/uapi/asm/swab.h new file mode 100644 index 00000000000..fadc3cc6d8a --- /dev/null +++ b/arch/score/include/uapi/asm/swab.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_SWAB_H +#define _ASM_SCORE_SWAB_H + +#include + +#endif /* _ASM_SCORE_SWAB_H */ diff --git a/arch/score/include/uapi/asm/termbits.h b/arch/score/include/uapi/asm/termbits.h new file mode 100644 index 00000000000..9a95c141243 --- /dev/null +++ b/arch/score/include/uapi/asm/termbits.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_TERMBITS_H +#define _ASM_SCORE_TERMBITS_H + +#include + +#endif /* _ASM_SCORE_TERMBITS_H */ diff --git a/arch/score/include/uapi/asm/termios.h b/arch/score/include/uapi/asm/termios.h new file mode 100644 index 00000000000..40984e811ad --- /dev/null +++ b/arch/score/include/uapi/asm/termios.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_TERMIOS_H +#define _ASM_SCORE_TERMIOS_H + +#include + +#endif /* _ASM_SCORE_TERMIOS_H */ diff --git a/arch/score/include/uapi/asm/types.h b/arch/score/include/uapi/asm/types.h new file mode 100644 index 00000000000..2140032778e --- /dev/null +++ b/arch/score/include/uapi/asm/types.h @@ -0,0 +1,6 @@ +#ifndef _ASM_SCORE_TYPES_H +#define _ASM_SCORE_TYPES_H + +#include + +#endif /* _ASM_SCORE_TYPES_H */ diff --git a/arch/score/include/uapi/asm/unistd.h b/arch/score/include/uapi/asm/unistd.h new file mode 100644 index 00000000000..56001c93095 --- /dev/null +++ b/arch/score/include/uapi/asm/unistd.h @@ -0,0 +1,12 @@ +#define __ARCH_HAVE_MMU + +#define __ARCH_WANT_SYSCALL_NO_AT +#define __ARCH_WANT_SYSCALL_NO_FLAGS +#define __ARCH_WANT_SYSCALL_OFF_T +#define __ARCH_WANT_SYSCALL_DEPRECATED +#define __ARCH_WANT_SYS_EXECVE +#define __ARCH_WANT_SYS_CLONE +#define __ARCH_WANT_SYS_FORK +#define __ARCH_WANT_SYS_VFORK + +#include -- cgit v1.2.3