Skip to content

Commit d66d8c7

Browse files
dhowellsdhowells
committed
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>
1 parent f01af9f commit d66d8c7

35 files changed

+118
-80
lines changed

‎arch/score/include/asm/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
include include/asm-generic/Kbuild.asm
21

32
header-y +=
43

‎arch/score/include/asm/ptrace.h

Lines changed: 1 addition & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,8 @@
11
#ifndef _ASM_SCORE_PTRACE_H
22
#define _ASM_SCORE_PTRACE_H
33

4-
#define PTRACE_GETREGS 12
5-
#define PTRACE_SETREGS 13
4+
#include <uapi/asm/ptrace.h>
65

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__
766

777
struct task_struct;
788

@@ -91,6 +21,4 @@ extern int read_tsk_short(struct task_struct *, unsigned long,
9121

9222
#define arch_has_single_step() (1)
9323

94-
#endif /* __KERNEL__ */
95-
9624
#endif /* _ASM_SCORE_PTRACE_H */

‎arch/score/include/asm/setup.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
#ifndef _ASM_SCORE_SETUP_H
22
#define _ASM_SCORE_SETUP_H
33

4-
#define COMMAND_LINE_SIZE 256
5-
#define MEMORY_START 0
6-
#define MEMORY_SIZE 0x2000000
4+
#include <uapi/asm/setup.h>
75

8-
#ifdef __KERNEL__
96

107
extern void pagetable_init(void);
118
extern void pgd_init(unsigned long page);
@@ -36,6 +33,4 @@ extern void debug_exception_vector(void);
3633
extern void general_exception_vector(void);
3734
extern void interrupt_exception_vector(void);
3835

39-
#endif /* __KERNEL__ */
40-
4136
#endif /* _ASM_SCORE_SETUP_H */

‎arch/score/include/uapi/asm/Kbuild

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
11
# UAPI Header export list
22
include include/uapi/asm-generic/Kbuild.asm
33

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

‎arch/score/include/asm/auxvec.h renamed to ‎arch/score/include/uapi/asm/auxvec.h

File renamed without changes.

‎arch/score/include/asm/bitsperlong.h renamed to ‎arch/score/include/uapi/asm/bitsperlong.h

File renamed without changes.

‎arch/score/include/asm/byteorder.h renamed to ‎arch/score/include/uapi/asm/byteorder.h

File renamed without changes.

‎arch/score/include/asm/errno.h renamed to ‎arch/score/include/uapi/asm/errno.h

File renamed without changes.

‎arch/score/include/asm/fcntl.h renamed to ‎arch/score/include/uapi/asm/fcntl.h

File renamed without changes.

‎arch/score/include/asm/ioctl.h renamed to ‎arch/score/include/uapi/asm/ioctl.h

File renamed without changes.

‎arch/score/include/asm/ioctls.h renamed to ‎arch/score/include/uapi/asm/ioctls.h

File renamed without changes.

‎arch/score/include/asm/ipcbuf.h renamed to ‎arch/score/include/uapi/asm/ipcbuf.h

File renamed without changes.

‎arch/score/include/asm/kvm_para.h renamed to ‎arch/score/include/uapi/asm/kvm_para.h

File renamed without changes.

‎arch/score/include/asm/mman.h renamed to ‎arch/score/include/uapi/asm/mman.h

File renamed without changes.

‎arch/score/include/asm/msgbuf.h renamed to ‎arch/score/include/uapi/asm/msgbuf.h

File renamed without changes.

‎arch/score/include/asm/param.h renamed to ‎arch/score/include/uapi/asm/param.h

File renamed without changes.

‎arch/score/include/asm/poll.h renamed to ‎arch/score/include/uapi/asm/poll.h

File renamed without changes.

‎arch/score/include/asm/posix_types.h renamed to ‎arch/score/include/uapi/asm/posix_types.h

File renamed without changes.

‎arch/score/include/uapi/asm/ptrace.h

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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 */

‎arch/score/include/asm/resource.h renamed to ‎arch/score/include/uapi/asm/resource.h

File renamed without changes.

‎arch/score/include/asm/sembuf.h renamed to ‎arch/score/include/uapi/asm/sembuf.h

File renamed without changes.

‎arch/score/include/uapi/asm/setup.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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 */

‎arch/score/include/asm/shmbuf.h renamed to ‎arch/score/include/uapi/asm/shmbuf.h

File renamed without changes.

‎arch/score/include/asm/sigcontext.h renamed to ‎arch/score/include/uapi/asm/sigcontext.h

File renamed without changes.

‎arch/score/include/asm/siginfo.h renamed to ‎arch/score/include/uapi/asm/siginfo.h

File renamed without changes.

‎arch/score/include/asm/signal.h renamed to ‎arch/score/include/uapi/asm/signal.h

File renamed without changes.

‎arch/score/include/asm/socket.h renamed to ‎arch/score/include/uapi/asm/socket.h

File renamed without changes.

‎arch/score/include/asm/sockios.h renamed to ‎arch/score/include/uapi/asm/sockios.h

File renamed without changes.

‎arch/score/include/asm/stat.h renamed to ‎arch/score/include/uapi/asm/stat.h

File renamed without changes.

‎arch/score/include/asm/statfs.h renamed to ‎arch/score/include/uapi/asm/statfs.h

File renamed without changes.

‎arch/score/include/asm/swab.h renamed to ‎arch/score/include/uapi/asm/swab.h

File renamed without changes.

‎arch/score/include/asm/termbits.h renamed to ‎arch/score/include/uapi/asm/termbits.h

File renamed without changes.

‎arch/score/include/asm/termios.h renamed to ‎arch/score/include/uapi/asm/termios.h

File renamed without changes.

‎arch/score/include/asm/types.h renamed to ‎arch/score/include/uapi/asm/types.h

File renamed without changes.

‎arch/score/include/asm/unistd.h renamed to ‎arch/score/include/uapi/asm/unistd.h

File renamed without changes.

0 commit comments

Comments
 (0)