Skip to content

Commit 6257c57

Browse files
author
Jonas Bonn
committed
Merge tag 'disintegrate-openrisc-20121009' of git://git.infradead.org/users/dhowells/linux-headers
UAPI Disintegration 2012-10-09 * tag 'disintegrate-openrisc-20121009' of git://git.infradead.org/users/dhowells/linux-headers: UAPI: (Scripted) Disintegrate arch/openrisc/include/asm
2 parents 4d7127d + 913c230 commit 6257c57

File tree

11 files changed

+113
-68
lines changed

11 files changed

+113
-68
lines changed

‎arch/openrisc/include/asm/Kbuild

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

3-
header-y += elf.h
42
header-y += ucontext.h
53

64
generic-y += atomic.h

‎arch/openrisc/include/asm/elf.h

Lines changed: 1 addition & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -15,60 +15,12 @@
1515
* the Free Software Foundation; either version 2 of the License, or
1616
* (at your option) any later version.
1717
*/
18-
1918
#ifndef __ASM_OPENRISC_ELF_H
2019
#define __ASM_OPENRISC_ELF_H
2120

22-
/*
23-
* This files is partially exported to userspace. This allows us to keep
24-
* the ELF bits in one place which should assist in keeping the kernel and
25-
* userspace in sync.
26-
*/
27-
28-
/*
29-
* ELF register definitions..
30-
*/
31-
32-
/* for struct user_regs_struct definition */
33-
#include <asm/ptrace.h>
34-
35-
/* The OR1K relocation types... not all relevant for module loader */
36-
#define R_OR32_NONE 0
37-
#define R_OR32_32 1
38-
#define R_OR32_16 2
39-
#define R_OR32_8 3
40-
#define R_OR32_CONST 4
41-
#define R_OR32_CONSTH 5
42-
#define R_OR32_JUMPTARG 6
43-
#define R_OR32_VTINHERIT 7
44-
#define R_OR32_VTENTRY 8
45-
46-
typedef unsigned long elf_greg_t;
47-
48-
/*
49-
* Note that NGREG is defined to ELF_NGREG in include/linux/elfcore.h, and is
50-
* thus exposed to user-space.
51-
*/
52-
#define ELF_NGREG (sizeof(struct user_regs_struct) / sizeof(elf_greg_t))
53-
typedef elf_greg_t elf_gregset_t[ELF_NGREG];
54-
55-
/* A placeholder; OR32 does not have fp support yes, so no fp regs for now. */
56-
typedef unsigned long elf_fpregset_t;
57-
58-
/* This should be moved to include/linux/elf.h */
59-
#define EM_OR32 0x8472
60-
#define EM_OPENRISC 92 /* OpenRISC 32-bit embedded processor */
61-
62-
/*
63-
* These are used to set parameters in the core dumps.
64-
*/
65-
#define ELF_ARCH EM_OR32
66-
#define ELF_CLASS ELFCLASS32
67-
#define ELF_DATA ELFDATA2MSB
68-
69-
#ifdef __KERNEL__
7021

7122
#include <linux/types.h>
23+
#include <uapi/asm/elf.h>
7224

7325
/*
7426
* This is used to ensure we don't load something for the wrong architecture.
@@ -113,5 +65,4 @@ extern void dump_elf_thread(elf_greg_t *dest, struct pt_regs *pt);
11365
#define SET_PERSONALITY(ex) \
11466
set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
11567

116-
#endif /* __KERNEL__ */
11768
#endif

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

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,12 @@
1515
* the Free Software Foundation; either version 2 of the License, or
1616
* (at your option) any later version.
1717
*/
18-
1918
#ifndef __ASM_OPENRISC_PTRACE_H
2019
#define __ASM_OPENRISC_PTRACE_H
2120

22-
#ifndef __ASSEMBLY__
23-
/*
24-
* This is the layout of the regset returned by the GETREGSET ptrace call
25-
*/
26-
struct user_regs_struct {
27-
/* GPR R0-R31... */
28-
unsigned long gpr[32];
29-
unsigned long pc;
30-
unsigned long sr;
31-
};
32-
#endif
33-
34-
#ifdef __KERNEL__
3521

3622
#include <asm/spr_defs.h>
23+
#include <uapi/asm/ptrace.h>
3724

3825
/*
3926
* Make kernel PTrace/register structures opaque to userspace... userspace can
@@ -134,6 +121,4 @@ static inline long regs_return_value(struct pt_regs *regs)
134121
#define PT_ORIG_GPR11 132
135122
#define PT_SYSCALLNO 136
136123

137-
#endif /* __KERNEL__ */
138-
139124
#endif /* __ASM_OPENRISC_PTRACE_H */

‎arch/openrisc/include/uapi/asm/Kbuild

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

4+
header-y += byteorder.h
5+
header-y += elf.h
6+
header-y += kvm_para.h
7+
header-y += param.h
8+
header-y += ptrace.h
9+
header-y += sigcontext.h
10+
header-y += unistd.h

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

File renamed without changes.

‎arch/openrisc/include/uapi/asm/elf.h

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
/*
2+
* OpenRISC Linux
3+
*
4+
* Linux architectural port borrowing liberally from similar works of
5+
* others. All original copyrights apply as per the original source
6+
* declaration.
7+
*
8+
* OpenRISC implementation:
9+
* Copyright (C) 2003 Matjaz Breskvar <phoenix@bsemi.com>
10+
* Copyright (C) 2010-2011 Jonas Bonn <jonas@southpole.se>
11+
* et al.
12+
*
13+
* This program is free software; you can redistribute it and/or modify
14+
* it under the terms of the GNU General Public License as published by
15+
* the Free Software Foundation; either version 2 of the License, or
16+
* (at your option) any later version.
17+
*/
18+
19+
#ifndef _UAPI__ASM_OPENRISC_ELF_H
20+
#define _UAPI__ASM_OPENRISC_ELF_H
21+
22+
/*
23+
* This files is partially exported to userspace. This allows us to keep
24+
* the ELF bits in one place which should assist in keeping the kernel and
25+
* userspace in sync.
26+
*/
27+
28+
/*
29+
* ELF register definitions..
30+
*/
31+
32+
/* for struct user_regs_struct definition */
33+
#include <asm/ptrace.h>
34+
35+
/* The OR1K relocation types... not all relevant for module loader */
36+
#define R_OR32_NONE 0
37+
#define R_OR32_32 1
38+
#define R_OR32_16 2
39+
#define R_OR32_8 3
40+
#define R_OR32_CONST 4
41+
#define R_OR32_CONSTH 5
42+
#define R_OR32_JUMPTARG 6
43+
#define R_OR32_VTINHERIT 7
44+
#define R_OR32_VTENTRY 8
45+
46+
typedef unsigned long elf_greg_t;
47+
48+
/*
49+
* Note that NGREG is defined to ELF_NGREG in include/linux/elfcore.h, and is
50+
* thus exposed to user-space.
51+
*/
52+
#define ELF_NGREG (sizeof(struct user_regs_struct) / sizeof(elf_greg_t))
53+
typedef elf_greg_t elf_gregset_t[ELF_NGREG];
54+
55+
/* A placeholder; OR32 does not have fp support yes, so no fp regs for now. */
56+
typedef unsigned long elf_fpregset_t;
57+
58+
/* This should be moved to include/linux/elf.h */
59+
#define EM_OR32 0x8472
60+
#define EM_OPENRISC 92 /* OpenRISC 32-bit embedded processor */
61+
62+
/*
63+
* These are used to set parameters in the core dumps.
64+
*/
65+
#define ELF_ARCH EM_OR32
66+
#define ELF_CLASS ELFCLASS32
67+
#define ELF_DATA ELFDATA2MSB
68+
69+
#endif /* _UAPI__ASM_OPENRISC_ELF_H */

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

File renamed without changes.

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

File renamed without changes.

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*
2+
* OpenRISC Linux
3+
*
4+
* Linux architectural port borrowing liberally from similar works of
5+
* others. All original copyrights apply as per the original source
6+
* declaration.
7+
*
8+
* OpenRISC implementation:
9+
* Copyright (C) 2003 Matjaz Breskvar <phoenix@bsemi.com>
10+
* Copyright (C) 2010-2011 Jonas Bonn <jonas@southpole.se>
11+
* et al.
12+
*
13+
* This program is free software; you can redistribute it and/or modify
14+
* it under the terms of the GNU General Public License as published by
15+
* the Free Software Foundation; either version 2 of the License, or
16+
* (at your option) any later version.
17+
*/
18+
19+
#ifndef _UAPI__ASM_OPENRISC_PTRACE_H
20+
#define _UAPI__ASM_OPENRISC_PTRACE_H
21+
22+
#ifndef __ASSEMBLY__
23+
/*
24+
* This is the layout of the regset returned by the GETREGSET ptrace call
25+
*/
26+
struct user_regs_struct {
27+
/* GPR R0-R31... */
28+
unsigned long gpr[32];
29+
unsigned long pc;
30+
unsigned long sr;
31+
};
32+
#endif
33+
34+
35+
#endif /* _UAPI__ASM_OPENRISC_PTRACE_H */

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

File renamed without changes.

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

File renamed without changes.

0 commit comments

Comments
 (0)