With this commit all sparc64 header files are moved to asm-sparc.
The remaining files (71 files) were too different to be trivially
merged so divide them up in a _32.h and a _64.h file which
are both included from the file with no bit size.
The following script were used:
cd include
FILES=`wc -l asm-sparc64/*h | grep -v '^ 1' | cut -b 20-`
for FILE in ${FILES}; do
echo $FILE:
BASE=`echo $FILE | cut -d '.' -f 1`
FN32=${BASE}_32.h
FN64=${BASE}_64.h
GUARD=___ASM_SPARC_`echo $BASE | tr '-' '_' | tr [:lower:] [:upper:]`_H
git mv asm-sparc/$FILE asm-sparc/$FN32
git mv asm-sparc64/$FILE asm-sparc/$FN64
echo git mv done
printf "#ifndef %s\n" $GUARD > asm-sparc/$FILE
printf "#define %s\n" $GUARD >> asm-sparc/$FILE
printf "#if defined(__sparc__) && defined(__arch64__)\n" >> asm-sparc/$FILE
printf "#include <asm-sparc/%s>\n" $FN64 >> asm-sparc/$FILE
printf "#else\n" >> asm-sparc/$FILE
printf "#include <asm-sparc/%s>\n" $FN32 >> asm-sparc/$FILE
printf "#endif\n" >> asm-sparc/$FILE
printf "#endif\n" >> asm-sparc/$FILE
git add asm-sparc/$FILE
echo new file done
printf "#include <asm-sparc/%s>\n" $FILE > asm-sparc64/$FILE
git add asm-sparc64/$FILE
echo sparc64 file done
done
The guard contains three '_' to avoid conflict with existing guards.
In additing the two Kbuild files are emptied to avoid breaking
headers_* targets.
We will reintroduce the exported header files when the necessary
kbuild changes are merged.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
63 lines
1.4 KiB
C
63 lines
1.4 KiB
C
#ifndef __SPARC_SIGCONTEXT_H
|
|
#define __SPARC_SIGCONTEXT_H
|
|
|
|
#ifdef __KERNEL__
|
|
#include <asm/ptrace.h>
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
#define __SUNOS_MAXWIN 31
|
|
|
|
/* This is what SunOS does, so shall I. */
|
|
struct sigcontext {
|
|
int sigc_onstack; /* state to restore */
|
|
int sigc_mask; /* sigmask to restore */
|
|
int sigc_sp; /* stack pointer */
|
|
int sigc_pc; /* program counter */
|
|
int sigc_npc; /* next program counter */
|
|
int sigc_psr; /* for condition codes etc */
|
|
int sigc_g1; /* User uses these two registers */
|
|
int sigc_o0; /* within the trampoline code. */
|
|
|
|
/* Now comes information regarding the users window set
|
|
* at the time of the signal.
|
|
*/
|
|
int sigc_oswins; /* outstanding windows */
|
|
|
|
/* stack ptrs for each regwin buf */
|
|
char *sigc_spbuf[__SUNOS_MAXWIN];
|
|
|
|
/* Windows to restore after signal */
|
|
struct {
|
|
unsigned long locals[8];
|
|
unsigned long ins[8];
|
|
} sigc_wbuf[__SUNOS_MAXWIN];
|
|
};
|
|
|
|
typedef struct {
|
|
struct {
|
|
unsigned long psr;
|
|
unsigned long pc;
|
|
unsigned long npc;
|
|
unsigned long y;
|
|
unsigned long u_regs[16]; /* globals and ins */
|
|
} si_regs;
|
|
int si_mask;
|
|
} __siginfo_t;
|
|
|
|
typedef struct {
|
|
unsigned long si_float_regs [32];
|
|
unsigned long si_fsr;
|
|
unsigned long si_fpqdepth;
|
|
struct {
|
|
unsigned long *insn_addr;
|
|
unsigned long insn;
|
|
} si_fpqueue [16];
|
|
} __siginfo_fpu_t;
|
|
|
|
#endif /* !(__ASSEMBLY__) */
|
|
|
|
#endif /* (__KERNEL__) */
|
|
|
|
#endif /* !(__SPARC_SIGCONTEXT_H) */
|