diff options
author | Greg Ungerer <gerg@uclinux.org> | 2009-03-16 04:00:25 -0400 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2009-03-16 04:00:25 -0400 |
commit | a05ef46731a1953590062e09a92c2c83ed32a086 (patch) | |
tree | 770561d2f868076835ecc539bef5440676a88a44 | |
parent | 9863a0babc2f0d920dfb4ddecf4e5b5342cb986b (diff) |
m68k: merge the non-MMU and MMU versions of sigcontext.h
It is trivial to merge the non-MMU and MMU versions of sigcontext.h.
Without a single file "make headers_install" is broken for m68k
(since each of the sub-varients of sigconext.h are not installed).
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
-rw-r--r-- | arch/m68k/include/asm/sigcontext.h | 25 | ||||
-rw-r--r-- | arch/m68k/include/asm/sigcontext_mm.h | 19 | ||||
-rw-r--r-- | arch/m68k/include/asm/sigcontext_no.h | 17 |
3 files changed, 22 insertions, 39 deletions
diff --git a/arch/m68k/include/asm/sigcontext.h b/arch/m68k/include/asm/sigcontext.h index bff6d40345a9..523db2a51cf3 100644 --- a/arch/m68k/include/asm/sigcontext.h +++ b/arch/m68k/include/asm/sigcontext.h | |||
@@ -1,5 +1,24 @@ | |||
1 | #ifndef _ASM_M68k_SIGCONTEXT_H | ||
2 | #define _ASM_M68k_SIGCONTEXT_H | ||
3 | |||
4 | struct sigcontext { | ||
5 | unsigned long sc_mask; /* old sigmask */ | ||
6 | unsigned long sc_usp; /* old user stack pointer */ | ||
7 | unsigned long sc_d0; | ||
8 | unsigned long sc_d1; | ||
9 | unsigned long sc_a0; | ||
10 | unsigned long sc_a1; | ||
1 | #ifdef __uClinux__ | 11 | #ifdef __uClinux__ |
2 | #include "sigcontext_no.h" | 12 | unsigned long sc_a5; |
3 | #else | 13 | #endif |
4 | #include "sigcontext_mm.h" | 14 | unsigned short sc_sr; |
15 | unsigned long sc_pc; | ||
16 | unsigned short sc_formatvec; | ||
17 | #ifndef __uClinux__ | ||
18 | unsigned long sc_fpregs[2*3]; /* room for two fp registers */ | ||
19 | unsigned long sc_fpcntl[3]; | ||
20 | unsigned char sc_fpstate[216]; | ||
21 | #endif | ||
22 | }; | ||
23 | |||
5 | #endif | 24 | #endif |
diff --git a/arch/m68k/include/asm/sigcontext_mm.h b/arch/m68k/include/asm/sigcontext_mm.h deleted file mode 100644 index 64fbe34cf26f..000000000000 --- a/arch/m68k/include/asm/sigcontext_mm.h +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | #ifndef _ASM_M68k_SIGCONTEXT_H | ||
2 | #define _ASM_M68k_SIGCONTEXT_H | ||
3 | |||
4 | struct sigcontext { | ||
5 | unsigned long sc_mask; /* old sigmask */ | ||
6 | unsigned long sc_usp; /* old user stack pointer */ | ||
7 | unsigned long sc_d0; | ||
8 | unsigned long sc_d1; | ||
9 | unsigned long sc_a0; | ||
10 | unsigned long sc_a1; | ||
11 | unsigned short sc_sr; | ||
12 | unsigned long sc_pc; | ||
13 | unsigned short sc_formatvec; | ||
14 | unsigned long sc_fpregs[2*3]; /* room for two fp registers */ | ||
15 | unsigned long sc_fpcntl[3]; | ||
16 | unsigned char sc_fpstate[216]; | ||
17 | }; | ||
18 | |||
19 | #endif | ||
diff --git a/arch/m68k/include/asm/sigcontext_no.h b/arch/m68k/include/asm/sigcontext_no.h deleted file mode 100644 index 36c293fc133d..000000000000 --- a/arch/m68k/include/asm/sigcontext_no.h +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | #ifndef _ASM_M68KNOMMU_SIGCONTEXT_H | ||
2 | #define _ASM_M68KNOMMU_SIGCONTEXT_H | ||
3 | |||
4 | struct sigcontext { | ||
5 | unsigned long sc_mask; /* old sigmask */ | ||
6 | unsigned long sc_usp; /* old user stack pointer */ | ||
7 | unsigned long sc_d0; | ||
8 | unsigned long sc_d1; | ||
9 | unsigned long sc_a0; | ||
10 | unsigned long sc_a1; | ||
11 | unsigned long sc_a5; | ||
12 | unsigned short sc_sr; | ||
13 | unsigned long sc_pc; | ||
14 | unsigned short sc_formatvec; | ||
15 | }; | ||
16 | |||
17 | #endif | ||