diff options
Diffstat (limited to 'arch/score/include/asm')
34 files changed, 4 insertions, 268 deletions
diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index ec697aeefd05..cebaff8069a1 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@ -1,5 +1,5 @@ -include include/asm-generic/Kbuild.asm header-y += generic-y += clkdev.h +generic-y += trace_clock.h diff --git a/arch/score/include/asm/auxvec.h b/arch/score/include/asm/auxvec.h deleted file mode 100644 index f69151565aee..000000000000 --- 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 86ff337aa459..000000000000 --- a/arch/score/include/asm/bitsperlong.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_BITSPERLONG_H -#define _ASM_SCORE_BITSPERLONG_H - -#include <asm-generic/bitsperlong.h> - -#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 88cbebc79212..000000000000 --- a/arch/score/include/asm/byteorder.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_BYTEORDER_H -#define _ASM_SCORE_BYTEORDER_H - -#include <linux/byteorder/little_endian.h> - -#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 29ff39d5ab47..000000000000 --- a/arch/score/include/asm/errno.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_ERRNO_H -#define _ASM_SCORE_ERRNO_H - -#include <asm-generic/errno.h> - -#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 03968a3103a4..000000000000 --- a/arch/score/include/asm/fcntl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_FCNTL_H -#define _ASM_SCORE_FCNTL_H - -#include <asm-generic/fcntl.h> - -#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 a351d2194bfd..000000000000 --- a/arch/score/include/asm/ioctl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_IOCTL_H -#define _ASM_SCORE_IOCTL_H - -#include <asm-generic/ioctl.h> - -#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 ed01d2b9aeab..000000000000 --- a/arch/score/include/asm/ioctls.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_IOCTLS_H -#define _ASM_SCORE_IOCTLS_H - -#include <asm-generic/ioctls.h> - -#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 e082ceff1818..000000000000 --- a/arch/score/include/asm/ipcbuf.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_IPCBUF_H -#define _ASM_SCORE_IPCBUF_H - -#include <asm-generic/ipcbuf.h> - -#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 14fab8f0b957..000000000000 --- a/arch/score/include/asm/kvm_para.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/kvm_para.h> diff --git a/arch/score/include/asm/mman.h b/arch/score/include/asm/mman.h deleted file mode 100644 index 84d85ddfed8d..000000000000 --- a/arch/score/include/asm/mman.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_MMAN_H -#define _ASM_SCORE_MMAN_H - -#include <asm-generic/mman.h> - -#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 7506721e29fa..000000000000 --- a/arch/score/include/asm/msgbuf.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_MSGBUF_H -#define _ASM_SCORE_MSGBUF_H - -#include <asm-generic/msgbuf.h> - -#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 916b8690b6aa..000000000000 --- a/arch/score/include/asm/param.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_PARAM_H -#define _ASM_SCORE_PARAM_H - -#include <asm-generic/param.h> - -#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 18532db02861..000000000000 --- a/arch/score/include/asm/poll.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_POLL_H -#define _ASM_SCORE_POLL_H - -#include <asm-generic/poll.h> - -#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 b88acf80048a..000000000000 --- 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 <asm-generic/posix_types.h> - -#endif /* _ASM_SCORE_POSIX_TYPES_H */ diff --git a/arch/score/include/asm/processor.h b/arch/score/include/asm/processor.h index ab3aceb54209..d9a922d8711b 100644 --- a/arch/score/include/asm/processor.h +++ b/arch/score/include/asm/processor.h @@ -13,7 +13,6 @@ struct task_struct; */ extern void (*cpu_wait)(void); -extern long kernel_thread(int (*fn)(void *), void *arg, unsigned long flags); extern unsigned long thread_saved_pc(struct task_struct *tsk); extern void start_thread(struct pt_regs *regs, unsigned long pc, unsigned long sp); diff --git a/arch/score/include/asm/ptrace.h b/arch/score/include/asm/ptrace.h index e89dc9b1ef49..abc279d96b73 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 <uapi/asm/ptrace.h> -#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; @@ -83,6 +13,7 @@ struct task_struct; #define instruction_pointer(regs) ((unsigned long)(regs)->cp0_epc) #define profile_pc(regs) instruction_pointer(regs) +#define user_stack_pointer(r) ((unsigned long)(r)->regs[0]) extern void do_syscall_trace(struct pt_regs *regs, int entryexit); extern int read_tsk_long(struct task_struct *, unsigned long, unsigned long *); @@ -91,6 +22,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 9ce22bc7b475..000000000000 --- a/arch/score/include/asm/resource.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_RESOURCE_H -#define _ASM_SCORE_RESOURCE_H - -#include <asm-generic/resource.h> - -#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 dae5e835ce9e..000000000000 --- a/arch/score/include/asm/sembuf.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_SEMBUF_H -#define _ASM_SCORE_SEMBUF_H - -#include <asm-generic/sembuf.h> - -#endif /* _ASM_SCORE_SEMBUF_H */ diff --git a/arch/score/include/asm/setup.h b/arch/score/include/asm/setup.h index 3cb944dc68dc..1f3aa7262fa3 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 <uapi/asm/setup.h> -#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 c85b2429ba21..000000000000 --- a/arch/score/include/asm/shmbuf.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_SHMBUF_H -#define _ASM_SCORE_SHMBUF_H - -#include <asm-generic/shmbuf.h> - -#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 5ffda39ddb90..000000000000 --- 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 87ca35607a28..000000000000 --- a/arch/score/include/asm/siginfo.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_SIGINFO_H -#define _ASM_SCORE_SIGINFO_H - -#include <asm-generic/siginfo.h> - -#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 2605bc06b64f..000000000000 --- a/arch/score/include/asm/signal.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_SIGNAL_H -#define _ASM_SCORE_SIGNAL_H - -#include <asm-generic/signal.h> - -#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 612a70e385ba..000000000000 --- a/arch/score/include/asm/socket.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_SOCKET_H -#define _ASM_SCORE_SOCKET_H - -#include <asm-generic/socket.h> - -#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 ba8256480189..000000000000 --- a/arch/score/include/asm/sockios.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_SOCKIOS_H -#define _ASM_SCORE_SOCKIOS_H - -#include <asm-generic/sockios.h> - -#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 5037055500a2..000000000000 --- a/arch/score/include/asm/stat.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_STAT_H -#define _ASM_SCORE_STAT_H - -#include <asm-generic/stat.h> - -#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 36e41004e996..000000000000 --- a/arch/score/include/asm/statfs.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_STATFS_H -#define _ASM_SCORE_STATFS_H - -#include <asm-generic/statfs.h> - -#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 fadc3cc6d8a2..000000000000 --- a/arch/score/include/asm/swab.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_SWAB_H -#define _ASM_SCORE_SWAB_H - -#include <asm-generic/swab.h> - -#endif /* _ASM_SCORE_SWAB_H */ diff --git a/arch/score/include/asm/syscalls.h b/arch/score/include/asm/syscalls.h index 1dd5e0d6b0c3..acaeed680956 100644 --- a/arch/score/include/asm/syscalls.h +++ b/arch/score/include/asm/syscalls.h @@ -1,8 +1,6 @@ #ifndef _ASM_SCORE_SYSCALLS_H #define _ASM_SCORE_SYSCALLS_H -asmlinkage long score_clone(struct pt_regs *regs); -asmlinkage long score_execve(struct pt_regs *regs); asmlinkage long score_sigaltstack(struct pt_regs *regs); asmlinkage long score_rt_sigreturn(struct pt_regs *regs); diff --git a/arch/score/include/asm/termbits.h b/arch/score/include/asm/termbits.h deleted file mode 100644 index 9a95c1412437..000000000000 --- a/arch/score/include/asm/termbits.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_TERMBITS_H -#define _ASM_SCORE_TERMBITS_H - -#include <asm-generic/termbits.h> - -#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 40984e811ad6..000000000000 --- a/arch/score/include/asm/termios.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_TERMIOS_H -#define _ASM_SCORE_TERMIOS_H - -#include <asm-generic/termios.h> - -#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 2140032778ee..000000000000 --- a/arch/score/include/asm/types.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_TYPES_H -#define _ASM_SCORE_TYPES_H - -#include <asm-generic/types.h> - -#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 a862384e9c16..000000000000 --- a/arch/score/include/asm/unistd.h +++ /dev/null @@ -1,8 +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 - -#include <asm-generic/unistd.h> |