From 7a2cf4af1554d891b440cc3a649d01ed222206c3 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Tue, 17 Mar 2009 08:47:11 +1000 Subject: [PATCH] m68k: merge the non-MMU and MMU versions of siginfo.h It is trivial to merge the non-MMU and MMU versions of siginfo.h. Without a single file "make headers_install" is broken for m68k (since each of the sub-varients of siginfo.h are not installed). Signed-off-by: Greg Ungerer --- arch/m68k/include/asm/{siginfo_mm.h => siginfo.h} | 5 +++++ arch/m68k/include/asm/siginfo_no.h | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) rename arch/m68k/include/asm/{siginfo_mm.h => siginfo.h} (96%) delete mode 100644 arch/m68k/include/asm/siginfo_no.h diff --git a/arch/m68k/include/asm/siginfo_mm.h b/arch/m68k/include/asm/siginfo.h similarity index 96% rename from arch/m68k/include/asm/siginfo_mm.h rename to arch/m68k/include/asm/siginfo.h index 05a8d6d90b5..ca7dde8fd22 100644 --- a/arch/m68k/include/asm/siginfo_mm.h +++ b/arch/m68k/include/asm/siginfo.h @@ -1,11 +1,15 @@ #ifndef _M68K_SIGINFO_H #define _M68K_SIGINFO_H +#ifndef __uClinux__ #define HAVE_ARCH_SIGINFO_T #define HAVE_ARCH_COPY_SIGINFO +#endif #include +#ifndef __uClinux__ + typedef struct siginfo { int si_signo; int si_errno; @@ -88,5 +92,6 @@ static inline void copy_siginfo(struct siginfo *to, struct siginfo *from) } #endif /* __KERNEL__ */ +#endif /* !__uClinux__ */ #endif diff --git a/arch/m68k/include/asm/siginfo_no.h b/arch/m68k/include/asm/siginfo_no.h deleted file mode 100644 index b18e5f4064a..00000000000 --- a/arch/m68k/include/asm/siginfo_no.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _M68KNOMMU_SIGINFO_H -#define _M68KNOMMU_SIGINFO_H - -#include - -#endif -- 2.11.4.GIT