Commit 6899ad04 authored by Jeremy Huddleston's avatar Jeremy Huddleston Committed by David S. Miller

[SPARC]: Make some asm headers more userland friendly.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ffe26efd
...@@ -43,10 +43,12 @@ ...@@ -43,10 +43,12 @@
struct task_struct; struct task_struct;
#ifdef __KERNEL__
struct fpq { struct fpq {
unsigned long *insn_addr; unsigned long *insn_addr;
unsigned long insn; unsigned long insn;
}; };
#endif
typedef struct { typedef struct {
int seg; int seg;
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <asm/ptrace.h> #include <asm/ptrace.h>
#endif
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
...@@ -59,4 +58,6 @@ typedef struct { ...@@ -59,4 +58,6 @@ typedef struct {
#endif /* !(__ASSEMBLY__) */ #endif /* !(__ASSEMBLY__) */
#endif /* (__KERNEL__) */
#endif /* !(__SPARC_SIGCONTEXT_H) */ #endif /* !(__SPARC_SIGCONTEXT_H) */
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#define _ASMSPARC_SIGNAL_H #define _ASMSPARC_SIGNAL_H
#include <asm/sigcontext.h> #include <asm/sigcontext.h>
#include <linux/compiler.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
...@@ -111,11 +112,14 @@ typedef struct { ...@@ -111,11 +112,14 @@ typedef struct {
unsigned long sig[_NSIG_WORDS]; unsigned long sig[_NSIG_WORDS];
} __new_sigset_t; } __new_sigset_t;
#ifdef __KERNEL__
/* A SunOS sigstack */ /* A SunOS sigstack */
struct sigstack { struct sigstack {
char *the_stack; char *the_stack;
int cur_status; int cur_status;
}; };
#endif
/* Sigvec flags */ /* Sigvec flags */
#define _SV_SSTACK 1u /* This signal handler should use sig-stack */ #define _SV_SSTACK 1u /* This signal handler should use sig-stack */
...@@ -189,6 +193,7 @@ typedef void (*__sighandler_t)(int); ...@@ -189,6 +193,7 @@ typedef void (*__sighandler_t)(int);
#define SIG_IGN ((__sighandler_t)1) /* ignore signal */ #define SIG_IGN ((__sighandler_t)1) /* ignore signal */
#define SIG_ERR ((__sighandler_t)-1) /* error return from signal */ #define SIG_ERR ((__sighandler_t)-1) /* error return from signal */
#ifdef __KERNEL__
struct __new_sigaction { struct __new_sigaction {
__sighandler_t sa_handler; __sighandler_t sa_handler;
unsigned long sa_flags; unsigned long sa_flags;
...@@ -196,12 +201,10 @@ struct __new_sigaction { ...@@ -196,12 +201,10 @@ struct __new_sigaction {
__new_sigset_t sa_mask; __new_sigset_t sa_mask;
}; };
#ifdef __KERNEL__
struct k_sigaction { struct k_sigaction {
struct __new_sigaction sa; struct __new_sigaction sa;
void __user *ka_restorer; void __user *ka_restorer;
}; };
#endif
struct __old_sigaction { struct __old_sigaction {
__sighandler_t sa_handler; __sighandler_t sa_handler;
...@@ -216,7 +219,6 @@ typedef struct sigaltstack { ...@@ -216,7 +219,6 @@ typedef struct sigaltstack {
size_t ss_size; size_t ss_size;
} stack_t; } stack_t;
#ifdef __KERNEL__
struct sparc_deliver_cookie { struct sparc_deliver_cookie {
int restart_syscall; int restart_syscall;
unsigned long orig_i0; unsigned long orig_i0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment