Skip to content

Commit

Permalink
m68k: merge the non-MMU and MMU versions of sigcontext.h
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Ungerer committed Mar 16, 2009
1 parent 9863a0b commit a05ef46
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 39 deletions.
25 changes: 22 additions & 3 deletions arch/m68k/include/asm/sigcontext.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,24 @@
#ifndef _ASM_M68k_SIGCONTEXT_H
#define _ASM_M68k_SIGCONTEXT_H

struct sigcontext {
unsigned long sc_mask; /* old sigmask */
unsigned long sc_usp; /* old user stack pointer */
unsigned long sc_d0;
unsigned long sc_d1;
unsigned long sc_a0;
unsigned long sc_a1;
#ifdef __uClinux__
#include "sigcontext_no.h"
#else
#include "sigcontext_mm.h"
unsigned long sc_a5;
#endif
unsigned short sc_sr;
unsigned long sc_pc;
unsigned short sc_formatvec;
#ifndef __uClinux__
unsigned long sc_fpregs[2*3]; /* room for two fp registers */
unsigned long sc_fpcntl[3];
unsigned char sc_fpstate[216];
#endif
};

#endif
19 changes: 0 additions & 19 deletions arch/m68k/include/asm/sigcontext_mm.h

This file was deleted.

17 changes: 0 additions & 17 deletions arch/m68k/include/asm/sigcontext_no.h

This file was deleted.

0 comments on commit a05ef46

Please sign in to comment.