Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c5a4734 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'openrisc-uapi' of git://openrisc.net/jonas/linux 

Pull OpenRISC uapi disintegration from Jonas Bonn:
 "OpenRISC UAPI disintegration work from David Howells"

* tag 'openrisc-uapi' of git://openrisc.net/jonas/linux:
  UAPI: (Scripted) Disintegrate arch/openrisc/include/asm
parents 09a9ad6a 6257c574

arch/openrisc/include/asm/Kbuild

+0 −2
Original line number Diff line number Diff line 
include include/asm-generic/Kbuild.asm



header-y += elf.h

header-y += ucontext.h



generic-y += atomic.h

arch/openrisc/include/asm/elf.h

+1 −50
Original line number Diff line number Diff line
@@ -15,60 +15,12 @@ 
 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */



#ifndef __ASM_OPENRISC_ELF_H

#define __ASM_OPENRISC_ELF_H



/*

 * This files is partially exported to userspace.  This allows us to keep

 * the ELF bits in one place which should assist in keeping the kernel and

 * userspace in sync.

 */



/*

 * ELF register definitions..

 */



/* for struct user_regs_struct definition */

#include <asm/ptrace.h>



/* The OR1K relocation types... not all relevant for module loader */

#define R_OR32_NONE	0

#define R_OR32_32	1

#define R_OR32_16	2

#define R_OR32_8	3

#define R_OR32_CONST	4

#define R_OR32_CONSTH	5

#define R_OR32_JUMPTARG	6

#define R_OR32_VTINHERIT 7

#define R_OR32_VTENTRY	8



typedef unsigned long elf_greg_t;



/*

 * Note that NGREG is defined to ELF_NGREG in include/linux/elfcore.h, and is

 * thus exposed to user-space.

 */

#define ELF_NGREG (sizeof(struct user_regs_struct) / sizeof(elf_greg_t))

typedef elf_greg_t elf_gregset_t[ELF_NGREG];



/* A placeholder; OR32 does not have fp support yes, so no fp regs for now.  */

typedef unsigned long elf_fpregset_t;



/* This should be moved to include/linux/elf.h */

#define EM_OR32         0x8472

#define EM_OPENRISC     92     /* OpenRISC 32-bit embedded processor */



/*

 * These are used to set parameters in the core dumps.

 */

#define ELF_ARCH	EM_OR32

#define ELF_CLASS	ELFCLASS32

#define ELF_DATA	ELFDATA2MSB



#ifdef __KERNEL__



#include <linux/types.h>

#include <uapi/asm/elf.h>



/*

 * 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); 
#define SET_PERSONALITY(ex) \

	set_personality(PER_LINUX | (current->personality & (~PER_MASK)))



#endif /* __KERNEL__ */

#endif

arch/openrisc/include/asm/ptrace.h

+1 −16
Original line number Diff line number Diff line
@@ -15,25 +15,12 @@ 
 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */



#ifndef __ASM_OPENRISC_PTRACE_H

#define __ASM_OPENRISC_PTRACE_H



#ifndef __ASSEMBLY__

/*

 * This is the layout of the regset returned by the GETREGSET ptrace call

 */

struct user_regs_struct {

	/* GPR R0-R31... */

	unsigned long gpr[32];

	unsigned long pc;

	unsigned long sr;

};

#endif



#ifdef __KERNEL__



#include <asm/spr_defs.h>

#include <uapi/asm/ptrace.h>



/*

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

#define PT_SYSCALLNO  136



#endif /* __KERNEL__ */



#endif /* __ASM_OPENRISC_PTRACE_H */

arch/openrisc/include/uapi/asm/Kbuild

+7 −0
Original line number Diff line number Diff line 
# UAPI Header export list

include include/uapi/asm-generic/Kbuild.asm



header-y += byteorder.h

header-y += elf.h

header-y += kvm_para.h

header-y += param.h

header-y += ptrace.h

header-y += sigcontext.h

header-y += unistd.h