UAPI: (Scripted) Disintegrate arch/score/include/asm

Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Michael Kerrisk <mtk.manpages@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Acked-by: Dave Jones <davej@redhat.com> Acked-by: Lennox Wu <lennox.wu@gmail.com> Acked-by: Liqin Chen <liqin299@gmail.com>
author: David Howells <dhowells@redhat.com> 2012-12-20 05:53:58 -0500
committer: David Howells <dhowells@redhat.com> 2012-12-20 05:55:33 -0500
commit: d66d8c7187989cedae43cb349626a7f304c60ec6 (patch)
tree: f9fa265cb42dc7d8e4ba28216b63b24998d93d6e /arch
parent: f01af9f85855e38fbd601e033a8eac204cc4cc1c (diff)
35 files changed, 118 insertions, 80 deletions
diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild
index 16e41fe1a419..cebaff8069a1 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/ptrace.h b/arch/score/include/asm/ptrace.h
index e89dc9b1ef49..78fc538db84c 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
+#include <uapi/asm/ptrace.h>
-#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;
-};
-#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/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
+#include <uapi/asm/setup.h>
-#define MEMORY_START            0
-#define MEMORY_SIZE             0x2000000
-#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/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild
index baebb3da1d44..040178cdb3eb 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/asm/auxvec.h b/arch/score/include/uapi/asm/auxvec.h
index f69151565aee..f69151565aee 100644
--- a/arch/score/include/asm/auxvec.h
+++ b/arch/score/include/uapi/asm/auxvec.h
diff --git a/arch/score/include/asm/bitsperlong.h b/arch/score/include/uapi/asm/bitsperlong.h
index 86ff337aa459..86ff337aa459 100644
--- a/arch/score/include/asm/bitsperlong.h
+++ b/arch/score/include/uapi/asm/bitsperlong.h
diff --git a/arch/score/include/asm/byteorder.h b/arch/score/include/uapi/asm/byteorder.h
index 88cbebc79212..88cbebc79212 100644
--- a/arch/score/include/asm/byteorder.h
+++ b/arch/score/include/uapi/asm/byteorder.h
diff --git a/arch/score/include/asm/errno.h b/arch/score/include/uapi/asm/errno.h
index 29ff39d5ab47..29ff39d5ab47 100644
--- a/arch/score/include/asm/errno.h
+++ b/arch/score/include/uapi/asm/errno.h
diff --git a/arch/score/include/asm/fcntl.h b/arch/score/include/uapi/asm/fcntl.h
index 03968a3103a4..03968a3103a4 100644
--- a/arch/score/include/asm/fcntl.h
+++ b/arch/score/include/uapi/asm/fcntl.h
diff --git a/arch/score/include/asm/ioctl.h b/arch/score/include/uapi/asm/ioctl.h
index a351d2194bfd..a351d2194bfd 100644
--- a/arch/score/include/asm/ioctl.h
+++ b/arch/score/include/uapi/asm/ioctl.h
diff --git a/arch/score/include/asm/ioctls.h b/arch/score/include/uapi/asm/ioctls.h
index ed01d2b9aeab..ed01d2b9aeab 100644
--- a/arch/score/include/asm/ioctls.h
+++ b/arch/score/include/uapi/asm/ioctls.h
diff --git a/arch/score/include/asm/ipcbuf.h b/arch/score/include/uapi/asm/ipcbuf.h
index e082ceff1818..e082ceff1818 100644
--- a/arch/score/include/asm/ipcbuf.h
+++ b/arch/score/include/uapi/asm/ipcbuf.h
diff --git a/arch/score/include/asm/kvm_para.h b/arch/score/include/uapi/asm/kvm_para.h
index 14fab8f0b957..14fab8f0b957 100644
--- a/arch/score/include/asm/kvm_para.h
+++ b/arch/score/include/uapi/asm/kvm_para.h
diff --git a/arch/score/include/asm/mman.h b/arch/score/include/uapi/asm/mman.h
index 84d85ddfed8d..84d85ddfed8d 100644
--- a/arch/score/include/asm/mman.h
+++ b/arch/score/include/uapi/asm/mman.h
diff --git a/arch/score/include/asm/msgbuf.h b/arch/score/include/uapi/asm/msgbuf.h
index 7506721e29fa..7506721e29fa 100644
--- a/arch/score/include/asm/msgbuf.h
+++ b/arch/score/include/uapi/asm/msgbuf.h
diff --git a/arch/score/include/asm/param.h b/arch/score/include/uapi/asm/param.h
index 916b8690b6aa..916b8690b6aa 100644
--- a/arch/score/include/asm/param.h
+++ b/arch/score/include/uapi/asm/param.h
diff --git a/arch/score/include/asm/poll.h b/arch/score/include/uapi/asm/poll.h
index 18532db02861..18532db02861 100644
--- a/arch/score/include/asm/poll.h
+++ b/arch/score/include/uapi/asm/poll.h
diff --git a/arch/score/include/asm/posix_types.h b/arch/score/include/uapi/asm/posix_types.h
index b88acf80048a..b88acf80048a 100644
--- a/arch/score/include/asm/posix_types.h
+++ b/arch/score/include/uapi/asm/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 000000000000..f59771a3f127
--- /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/asm/resource.h b/arch/score/include/uapi/asm/resource.h
index 9ce22bc7b475..9ce22bc7b475 100644
--- a/arch/score/include/asm/resource.h
+++ b/arch/score/include/uapi/asm/resource.h
diff --git a/arch/score/include/asm/sembuf.h b/arch/score/include/uapi/asm/sembuf.h
index dae5e835ce9e..dae5e835ce9e 100644
--- a/arch/score/include/asm/sembuf.h
+++ b/arch/score/include/uapi/asm/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 000000000000..ab9dbdb59bba
--- /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/asm/shmbuf.h b/arch/score/include/uapi/asm/shmbuf.h
index c85b2429ba21..c85b2429ba21 100644
--- a/arch/score/include/asm/shmbuf.h
+++ b/arch/score/include/uapi/asm/shmbuf.h
diff --git a/arch/score/include/asm/sigcontext.h b/arch/score/include/uapi/asm/sigcontext.h
index 5ffda39ddb90..5ffda39ddb90 100644
--- a/arch/score/include/asm/sigcontext.h
+++ b/arch/score/include/uapi/asm/sigcontext.h
diff --git a/arch/score/include/asm/siginfo.h b/arch/score/include/uapi/asm/siginfo.h
index 87ca35607a28..87ca35607a28 100644
--- a/arch/score/include/asm/siginfo.h
+++ b/arch/score/include/uapi/asm/siginfo.h
diff --git a/arch/score/include/asm/signal.h b/arch/score/include/uapi/asm/signal.h
index 2605bc06b64f..2605bc06b64f 100644
--- a/arch/score/include/asm/signal.h
+++ b/arch/score/include/uapi/asm/signal.h
diff --git a/arch/score/include/asm/socket.h b/arch/score/include/uapi/asm/socket.h
index 612a70e385ba..612a70e385ba 100644
--- a/arch/score/include/asm/socket.h
+++ b/arch/score/include/uapi/asm/socket.h
diff --git a/arch/score/include/asm/sockios.h b/arch/score/include/uapi/asm/sockios.h
index ba8256480189..ba8256480189 100644
--- a/arch/score/include/asm/sockios.h
+++ b/arch/score/include/uapi/asm/sockios.h
diff --git a/arch/score/include/asm/stat.h b/arch/score/include/uapi/asm/stat.h
index 5037055500a2..5037055500a2 100644
--- a/arch/score/include/asm/stat.h
+++ b/arch/score/include/uapi/asm/stat.h
diff --git a/arch/score/include/asm/statfs.h b/arch/score/include/uapi/asm/statfs.h
index 36e41004e996..36e41004e996 100644
--- a/arch/score/include/asm/statfs.h
+++ b/arch/score/include/uapi/asm/statfs.h
diff --git a/arch/score/include/asm/swab.h b/arch/score/include/uapi/asm/swab.h
index fadc3cc6d8a2..fadc3cc6d8a2 100644
--- a/arch/score/include/asm/swab.h
+++ b/arch/score/include/uapi/asm/swab.h
diff --git a/arch/score/include/asm/termbits.h b/arch/score/include/uapi/asm/termbits.h
index 9a95c1412437..9a95c1412437 100644
--- a/arch/score/include/asm/termbits.h
+++ b/arch/score/include/uapi/asm/termbits.h
diff --git a/arch/score/include/asm/termios.h b/arch/score/include/uapi/asm/termios.h
index 40984e811ad6..40984e811ad6 100644
--- a/arch/score/include/asm/termios.h
+++ b/arch/score/include/uapi/asm/termios.h
diff --git a/arch/score/include/asm/types.h b/arch/score/include/uapi/asm/types.h
index 2140032778ee..2140032778ee 100644
--- a/arch/score/include/asm/types.h
+++ b/arch/score/include/uapi/asm/types.h
diff --git a/arch/score/include/asm/unistd.h b/arch/score/include/uapi/asm/unistd.h
index 56001c93095a..56001c93095a 100644
--- a/arch/score/include/asm/unistd.h
+++ b/arch/score/include/uapi/asm/unistd.h
author	David Howells <dhowells@redhat.com>	2012-12-20 05:53:58 -0500
committer	David Howells <dhowells@redhat.com>	2012-12-20 05:55:33 -0500
commit	d66d8c7187989cedae43cb349626a7f304c60ec6 (patch)
tree	f9fa265cb42dc7d8e4ba28216b63b24998d93d6e /arch
parent	f01af9f85855e38fbd601e033a8eac204cc4cc1c (diff)

diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild index 16e41fe1a419..cebaff8069a1 100644 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild
@@ -1,4 +1,3 @@
1	include include/asm-generic/Kbuild.asm
2		1
3	header-y +=	2	header-y +=
4		3


diff --git a/arch/score/include/asm/ptrace.h b/arch/score/include/asm/ptrace.h index e89dc9b1ef49..78fc538db84c 100644 --- a/arch/score/include/asm/ptrace.h +++ b/arch/score/include/asm/ptrace.h
@@ -1,78 +1,8 @@
1	#ifndef _ASM_SCORE_PTRACE_H	1	#ifndef _ASM_SCORE_PTRACE_H
2	#define _ASM_SCORE_PTRACE_H	2	#define _ASM_SCORE_PTRACE_H
3		3
4	#define PTRACE_GETREGS 12	4	#include <uapi/asm/ptrace.h>
5	#define PTRACE_SETREGS 13
6		5
7	#define PC 32
8	#define CONDITION 33
9	#define ECR 34
10	#define EMA 35
11	#define CEH 36
12	#define CEL 37
13	#define COUNTER 38
14	#define LDCR 39
15	#define STCR 40
16	#define PSR 41
17
18	#define SINGLESTEP16_INSN 0x7006
19	#define SINGLESTEP32_INSN 0x840C8000
20	#define BREAKPOINT16_INSN 0x7002 /* work on SPG300 */
21	#define BREAKPOINT32_INSN 0x84048000 /* work on SPG300 */
22
23	/* Define instruction mask */
24	#define INSN32_MASK 0x80008000
25
26	#define J32 0x88008000 /* 1_00010_0000000000_1_000000000000000 */
27	#define J32M 0xFC008000 /* 1_11111_0000000000_1_000000000000000 */
28
29	#define B32 0x90008000 /* 1_00100_0000000000_1_000000000000000 */
30	#define B32M 0xFC008000
31	#define BL32 0x90008001 /* 1_00100_0000000000_1_000000000000001 */
32	#define BL32M B32
33	#define BR32 0x80008008 /* 1_00000_0000000000_1_00000000_000100_0 */
34	#define BR32M 0xFFE0807E
35	#define BRL32 0x80008009 /* 1_00000_0000000000_1_00000000_000100_1 */
36	#define BRL32M BR32M
37
38	#define B32_SET (J32 \| B32 \| BL32 \| BR32 \| BRL32)
39
40	#define J16 0x3000 /* 0_011_....... */
41	#define J16M 0xF000
42	#define B16 0x4000 /* 0_100_....... */
43	#define B16M 0xF000
44	#define BR16 0x0004 /* 0_000.......0100 */
45	#define BR16M 0xF00F
46	#define B16_SET (J16 \| B16 \| BR16)
47
48
49	/*
50	* This struct defines the way the registers are stored on the stack during a
51	* system call/exception. As usual the registers k0/k1 aren't being saved.
52	*/
53	struct pt_regs {
54	unsigned long pad0[6]; /* stack arguments */
55	unsigned long orig_r4;
56	unsigned long orig_r7;
57	long is_syscall;
58
59	unsigned long regs[32];
60
61	unsigned long cel;
62	unsigned long ceh;
63
64	unsigned long sr0; /* cnt */
65	unsigned long sr1; /* lcr */
66	unsigned long sr2; /* scr */
67
68	unsigned long cp0_epc;
69	unsigned long cp0_ema;
70	unsigned long cp0_psr;
71	unsigned long cp0_ecr;
72	unsigned long cp0_condition;
73	};
74
75	#ifdef __KERNEL__
76		6
77	struct task_struct;	7	struct task_struct;
78		8
@@ -91,6 +21,4 @@ extern int read_tsk_short(struct task_struct *, unsigned long,
91		21
92	#define arch_has_single_step() (1)	22	#define arch_has_single_step() (1)
93		23
94	#endif /* __KERNEL__ */
95
96	#endif /* _ASM_SCORE_PTRACE_H */	24	#endif /* _ASM_SCORE_PTRACE_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 @@
1	#ifndef _ASM_SCORE_SETUP_H	1	#ifndef _ASM_SCORE_SETUP_H
2	#define _ASM_SCORE_SETUP_H	2	#define _ASM_SCORE_SETUP_H
3		3
4	#define COMMAND_LINE_SIZE 256	4	#include <uapi/asm/setup.h>
5	#define MEMORY_START 0
6	#define MEMORY_SIZE 0x2000000
7		5
8	#ifdef __KERNEL__
9		6
10	extern void pagetable_init(void);	7	extern void pagetable_init(void);
11	extern void pgd_init(unsigned long page);	8	extern void pgd_init(unsigned long page);
@@ -36,6 +33,4 @@ extern void debug_exception_vector(void);
36	extern void general_exception_vector(void);	33	extern void general_exception_vector(void);
37	extern void interrupt_exception_vector(void);	34	extern void interrupt_exception_vector(void);
38		35
39	#endif /* __KERNEL__ */
40
41	#endif /* _ASM_SCORE_SETUP_H */	36	#endif /* _ASM_SCORE_SETUP_H */


diff --git a/arch/score/include/uapi/asm/Kbuild b/arch/score/include/uapi/asm/Kbuild index baebb3da1d44..040178cdb3eb 100644 --- a/arch/score/include/uapi/asm/Kbuild +++ b/arch/score/include/uapi/asm/Kbuild
@@ -1,3 +1,34 @@
1	# UAPI Header export list	1	# UAPI Header export list
2	include include/uapi/asm-generic/Kbuild.asm	2	include include/uapi/asm-generic/Kbuild.asm
3		3
		4	header-y += auxvec.h
		5	header-y += bitsperlong.h
		6	header-y += byteorder.h
		7	header-y += errno.h
		8	header-y += fcntl.h
		9	header-y += ioctl.h
		10	header-y += ioctls.h
		11	header-y += ipcbuf.h
		12	header-y += kvm_para.h
		13	header-y += mman.h
		14	header-y += msgbuf.h
		15	header-y += param.h
		16	header-y += poll.h
		17	header-y += posix_types.h
		18	header-y += ptrace.h
		19	header-y += resource.h
		20	header-y += sembuf.h
		21	header-y += setup.h
		22	header-y += shmbuf.h
		23	header-y += sigcontext.h
		24	header-y += siginfo.h
		25	header-y += signal.h
		26	header-y += socket.h
		27	header-y += sockios.h
		28	header-y += stat.h
		29	header-y += statfs.h
		30	header-y += swab.h
		31	header-y += termbits.h
		32	header-y += termios.h
		33	header-y += types.h
		34	header-y += unistd.h


diff --git a/arch/score/include/asm/auxvec.h b/arch/score/include/uapi/asm/auxvec.h index f69151565aee..f69151565aee 100644 --- a/arch/score/include/asm/auxvec.h +++ b/arch/score/include/uapi/asm/auxvec.h


diff --git a/arch/score/include/asm/bitsperlong.h b/arch/score/include/uapi/asm/bitsperlong.h index 86ff337aa459..86ff337aa459 100644 --- a/arch/score/include/asm/bitsperlong.h +++ b/arch/score/include/uapi/asm/bitsperlong.h


diff --git a/arch/score/include/asm/byteorder.h b/arch/score/include/uapi/asm/byteorder.h index 88cbebc79212..88cbebc79212 100644 --- a/arch/score/include/asm/byteorder.h +++ b/arch/score/include/uapi/asm/byteorder.h


diff --git a/arch/score/include/asm/errno.h b/arch/score/include/uapi/asm/errno.h index 29ff39d5ab47..29ff39d5ab47 100644 --- a/arch/score/include/asm/errno.h +++ b/arch/score/include/uapi/asm/errno.h


diff --git a/arch/score/include/asm/fcntl.h b/arch/score/include/uapi/asm/fcntl.h index 03968a3103a4..03968a3103a4 100644 --- a/arch/score/include/asm/fcntl.h +++ b/arch/score/include/uapi/asm/fcntl.h


diff --git a/arch/score/include/asm/ioctl.h b/arch/score/include/uapi/asm/ioctl.h index a351d2194bfd..a351d2194bfd 100644 --- a/arch/score/include/asm/ioctl.h +++ b/arch/score/include/uapi/asm/ioctl.h


diff --git a/arch/score/include/asm/ioctls.h b/arch/score/include/uapi/asm/ioctls.h index ed01d2b9aeab..ed01d2b9aeab 100644 --- a/arch/score/include/asm/ioctls.h +++ b/arch/score/include/uapi/asm/ioctls.h


diff --git a/arch/score/include/asm/ipcbuf.h b/arch/score/include/uapi/asm/ipcbuf.h index e082ceff1818..e082ceff1818 100644 --- a/arch/score/include/asm/ipcbuf.h +++ b/arch/score/include/uapi/asm/ipcbuf.h


diff --git a/arch/score/include/asm/kvm_para.h b/arch/score/include/uapi/asm/kvm_para.h index 14fab8f0b957..14fab8f0b957 100644 --- a/arch/score/include/asm/kvm_para.h +++ b/arch/score/include/uapi/asm/kvm_para.h


diff --git a/arch/score/include/asm/mman.h b/arch/score/include/uapi/asm/mman.h index 84d85ddfed8d..84d85ddfed8d 100644 --- a/arch/score/include/asm/mman.h +++ b/arch/score/include/uapi/asm/mman.h


diff --git a/arch/score/include/asm/msgbuf.h b/arch/score/include/uapi/asm/msgbuf.h index 7506721e29fa..7506721e29fa 100644 --- a/arch/score/include/asm/msgbuf.h +++ b/arch/score/include/uapi/asm/msgbuf.h


diff --git a/arch/score/include/asm/param.h b/arch/score/include/uapi/asm/param.h index 916b8690b6aa..916b8690b6aa 100644 --- a/arch/score/include/asm/param.h +++ b/arch/score/include/uapi/asm/param.h


diff --git a/arch/score/include/asm/poll.h b/arch/score/include/uapi/asm/poll.h index 18532db02861..18532db02861 100644 --- a/arch/score/include/asm/poll.h +++ b/arch/score/include/uapi/asm/poll.h


diff --git a/arch/score/include/asm/posix_types.h b/arch/score/include/uapi/asm/posix_types.h index b88acf80048a..b88acf80048a 100644 --- a/arch/score/include/asm/posix_types.h +++ b/arch/score/include/uapi/asm/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 000000000000..f59771a3f127 --- /dev/null +++ b/arch/score/include/uapi/asm/ptrace.h
@@ -0,0 +1,76 @@
		1	#ifndef _UAPI_ASM_SCORE_PTRACE_H
		2	#define _UAPI_ASM_SCORE_PTRACE_H
		3
		4	#define PTRACE_GETREGS 12
		5	#define PTRACE_SETREGS 13
		6
		7	#define PC 32
		8	#define CONDITION 33
		9	#define ECR 34
		10	#define EMA 35
		11	#define CEH 36
		12	#define CEL 37
		13	#define COUNTER 38
		14	#define LDCR 39
		15	#define STCR 40
		16	#define PSR 41
		17
		18	#define SINGLESTEP16_INSN 0x7006
		19	#define SINGLESTEP32_INSN 0x840C8000
		20	#define BREAKPOINT16_INSN 0x7002 /* work on SPG300 */
		21	#define BREAKPOINT32_INSN 0x84048000 /* work on SPG300 */
		22
		23	/* Define instruction mask */
		24	#define INSN32_MASK 0x80008000
		25
		26	#define J32 0x88008000 /* 1_00010_0000000000_1_000000000000000 */
		27	#define J32M 0xFC008000 /* 1_11111_0000000000_1_000000000000000 */
		28
		29	#define B32 0x90008000 /* 1_00100_0000000000_1_000000000000000 */
		30	#define B32M 0xFC008000
		31	#define BL32 0x90008001 /* 1_00100_0000000000_1_000000000000001 */
		32	#define BL32M B32
		33	#define BR32 0x80008008 /* 1_00000_0000000000_1_00000000_000100_0 */
		34	#define BR32M 0xFFE0807E
		35	#define BRL32 0x80008009 /* 1_00000_0000000000_1_00000000_000100_1 */
		36	#define BRL32M BR32M
		37
		38	#define B32_SET (J32 \| B32 \| BL32 \| BR32 \| BRL32)
		39
		40	#define J16 0x3000 /* 0_011_....... */
		41	#define J16M 0xF000
		42	#define B16 0x4000 /* 0_100_....... */
		43	#define B16M 0xF000
		44	#define BR16 0x0004 /* 0_000.......0100 */
		45	#define BR16M 0xF00F
		46	#define B16_SET (J16 \| B16 \| BR16)
		47
		48
		49	/*
		50	* This struct defines the way the registers are stored on the stack during a
		51	* system call/exception. As usual the registers k0/k1 aren't being saved.
		52	*/
		53	struct pt_regs {
		54	unsigned long pad0[6]; /* stack arguments */
		55	unsigned long orig_r4;
		56	unsigned long orig_r7;
		57	long is_syscall;
		58
		59	unsigned long regs[32];
		60
		61	unsigned long cel;
		62	unsigned long ceh;
		63
		64	unsigned long sr0; /* cnt */
		65	unsigned long sr1; /* lcr */
		66	unsigned long sr2; /* scr */
		67
		68	unsigned long cp0_epc;
		69	unsigned long cp0_ema;
		70	unsigned long cp0_psr;
		71	unsigned long cp0_ecr;
		72	unsigned long cp0_condition;
		73	};
		74
		75
		76	#endif /* _UAPI_ASM_SCORE_PTRACE_H */


diff --git a/arch/score/include/asm/resource.h b/arch/score/include/uapi/asm/resource.h index 9ce22bc7b475..9ce22bc7b475 100644 --- a/arch/score/include/asm/resource.h +++ b/arch/score/include/uapi/asm/resource.h


diff --git a/arch/score/include/asm/sembuf.h b/arch/score/include/uapi/asm/sembuf.h index dae5e835ce9e..dae5e835ce9e 100644 --- a/arch/score/include/asm/sembuf.h +++ b/arch/score/include/uapi/asm/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 000000000000..ab9dbdb59bba --- /dev/null +++ b/arch/score/include/uapi/asm/setup.h
@@ -0,0 +1,9 @@
		1	#ifndef _UAPI_ASM_SCORE_SETUP_H
		2	#define _UAPI_ASM_SCORE_SETUP_H
		3
		4	#define COMMAND_LINE_SIZE 256
		5	#define MEMORY_START 0
		6	#define MEMORY_SIZE 0x2000000
		7
		8
		9	#endif /* _UAPI_ASM_SCORE_SETUP_H */


diff --git a/arch/score/include/asm/shmbuf.h b/arch/score/include/uapi/asm/shmbuf.h index c85b2429ba21..c85b2429ba21 100644 --- a/arch/score/include/asm/shmbuf.h +++ b/arch/score/include/uapi/asm/shmbuf.h


diff --git a/arch/score/include/asm/sigcontext.h b/arch/score/include/uapi/asm/sigcontext.h index 5ffda39ddb90..5ffda39ddb90 100644 --- a/arch/score/include/asm/sigcontext.h +++ b/arch/score/include/uapi/asm/sigcontext.h


diff --git a/arch/score/include/asm/siginfo.h b/arch/score/include/uapi/asm/siginfo.h index 87ca35607a28..87ca35607a28 100644 --- a/arch/score/include/asm/siginfo.h +++ b/arch/score/include/uapi/asm/siginfo.h


diff --git a/arch/score/include/asm/signal.h b/arch/score/include/uapi/asm/signal.h index 2605bc06b64f..2605bc06b64f 100644 --- a/arch/score/include/asm/signal.h +++ b/arch/score/include/uapi/asm/signal.h


diff --git a/arch/score/include/asm/socket.h b/arch/score/include/uapi/asm/socket.h index 612a70e385ba..612a70e385ba 100644 --- a/arch/score/include/asm/socket.h +++ b/arch/score/include/uapi/asm/socket.h


diff --git a/arch/score/include/asm/sockios.h b/arch/score/include/uapi/asm/sockios.h index ba8256480189..ba8256480189 100644 --- a/arch/score/include/asm/sockios.h +++ b/arch/score/include/uapi/asm/sockios.h


diff --git a/arch/score/include/asm/stat.h b/arch/score/include/uapi/asm/stat.h index 5037055500a2..5037055500a2 100644 --- a/arch/score/include/asm/stat.h +++ b/arch/score/include/uapi/asm/stat.h


diff --git a/arch/score/include/asm/statfs.h b/arch/score/include/uapi/asm/statfs.h index 36e41004e996..36e41004e996 100644 --- a/arch/score/include/asm/statfs.h +++ b/arch/score/include/uapi/asm/statfs.h


diff --git a/arch/score/include/asm/swab.h b/arch/score/include/uapi/asm/swab.h index fadc3cc6d8a2..fadc3cc6d8a2 100644 --- a/arch/score/include/asm/swab.h +++ b/arch/score/include/uapi/asm/swab.h


diff --git a/arch/score/include/asm/termbits.h b/arch/score/include/uapi/asm/termbits.h index 9a95c1412437..9a95c1412437 100644 --- a/arch/score/include/asm/termbits.h +++ b/arch/score/include/uapi/asm/termbits.h


diff --git a/arch/score/include/asm/termios.h b/arch/score/include/uapi/asm/termios.h index 40984e811ad6..40984e811ad6 100644 --- a/arch/score/include/asm/termios.h +++ b/arch/score/include/uapi/asm/termios.h


diff --git a/arch/score/include/asm/types.h b/arch/score/include/uapi/asm/types.h index 2140032778ee..2140032778ee 100644 --- a/arch/score/include/asm/types.h +++ b/arch/score/include/uapi/asm/types.h


diff --git a/arch/score/include/asm/unistd.h b/arch/score/include/uapi/asm/unistd.h index 56001c93095a..56001c93095a 100644 --- a/arch/score/include/asm/unistd.h +++ b/arch/score/include/uapi/asm/unistd.h