OSDN Git Service

UAPI: (Scripted) Disintegrate arch/score/include/asm
authorDavid Howells <dhowells@redhat.com>
Thu, 20 Dec 2012 10:53:58 +0000 (10:53 +0000)
committerDavid Howells <dhowells@redhat.com>
Thu, 20 Dec 2012 10:55:33 +0000 (10:55 +0000)
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>
35 files changed:
arch/score/include/asm/Kbuild
arch/score/include/asm/ptrace.h
arch/score/include/asm/setup.h
arch/score/include/uapi/asm/Kbuild
arch/score/include/uapi/asm/auxvec.h [moved from arch/score/include/asm/auxvec.h with 100% similarity]
arch/score/include/uapi/asm/bitsperlong.h [moved from arch/score/include/asm/bitsperlong.h with 100% similarity]
arch/score/include/uapi/asm/byteorder.h [moved from arch/score/include/asm/byteorder.h with 100% similarity]
arch/score/include/uapi/asm/errno.h [moved from arch/score/include/asm/errno.h with 100% similarity]
arch/score/include/uapi/asm/fcntl.h [moved from arch/score/include/asm/fcntl.h with 100% similarity]
arch/score/include/uapi/asm/ioctl.h [moved from arch/score/include/asm/ioctl.h with 100% similarity]
arch/score/include/uapi/asm/ioctls.h [moved from arch/score/include/asm/ioctls.h with 100% similarity]
arch/score/include/uapi/asm/ipcbuf.h [moved from arch/score/include/asm/ipcbuf.h with 100% similarity]
arch/score/include/uapi/asm/kvm_para.h [moved from arch/score/include/asm/kvm_para.h with 100% similarity]
arch/score/include/uapi/asm/mman.h [moved from arch/score/include/asm/mman.h with 100% similarity]
arch/score/include/uapi/asm/msgbuf.h [moved from arch/score/include/asm/msgbuf.h with 100% similarity]
arch/score/include/uapi/asm/param.h [moved from arch/score/include/asm/param.h with 100% similarity]
arch/score/include/uapi/asm/poll.h [moved from arch/score/include/asm/poll.h with 100% similarity]
arch/score/include/uapi/asm/posix_types.h [moved from arch/score/include/asm/posix_types.h with 100% similarity]
arch/score/include/uapi/asm/ptrace.h [new file with mode: 0644]
arch/score/include/uapi/asm/resource.h [moved from arch/score/include/asm/resource.h with 100% similarity]
arch/score/include/uapi/asm/sembuf.h [moved from arch/score/include/asm/sembuf.h with 100% similarity]
arch/score/include/uapi/asm/setup.h [new file with mode: 0644]
arch/score/include/uapi/asm/shmbuf.h [moved from arch/score/include/asm/shmbuf.h with 100% similarity]
arch/score/include/uapi/asm/sigcontext.h [moved from arch/score/include/asm/sigcontext.h with 100% similarity]
arch/score/include/uapi/asm/siginfo.h [moved from arch/score/include/asm/siginfo.h with 100% similarity]
arch/score/include/uapi/asm/signal.h [moved from arch/score/include/asm/signal.h with 100% similarity]
arch/score/include/uapi/asm/socket.h [moved from arch/score/include/asm/socket.h with 100% similarity]
arch/score/include/uapi/asm/sockios.h [moved from arch/score/include/asm/sockios.h with 100% similarity]
arch/score/include/uapi/asm/stat.h [moved from arch/score/include/asm/stat.h with 100% similarity]
arch/score/include/uapi/asm/statfs.h [moved from arch/score/include/asm/statfs.h with 100% similarity]
arch/score/include/uapi/asm/swab.h [moved from arch/score/include/asm/swab.h with 100% similarity]
arch/score/include/uapi/asm/termbits.h [moved from arch/score/include/asm/termbits.h with 100% similarity]
arch/score/include/uapi/asm/termios.h [moved from arch/score/include/asm/termios.h with 100% similarity]
arch/score/include/uapi/asm/types.h [moved from arch/score/include/asm/types.h with 100% similarity]
arch/score/include/uapi/asm/unistd.h [moved from arch/score/include/asm/unistd.h with 100% similarity]

index 16e41fe..cebaff8 100644 (file)
@@ -1,4 +1,3 @@
-include include/asm-generic/Kbuild.asm
 
 header-y +=
 
index e89dc9b..78fc538 100644 (file)
@@ -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;
 
@@ -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 */
index 3cb944d..1f3aa72 100644 (file)
@@ -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 */
index baebb3d..040178c 100644 (file)
@@ -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/ptrace.h b/arch/score/include/uapi/asm/ptrace.h
new file mode 100644 (file)
index 0000000..f59771a
--- /dev/null
@@ -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/setup.h b/arch/score/include/uapi/asm/setup.h
new file mode 100644 (file)
index 0000000..ab9dbdb
--- /dev/null
@@ -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 */