Skip to content

Commit

Permalink
m68k: use CPU_HAS_NO_BITFIELDS for signal functions
Browse files Browse the repository at this point in the history
When reworking bitops.h to be clean for all processor types we introduced
a CONFIG_CPU_HAS_NO_BITFIELDS define to signal whether this processor type
supported the bit field instructions. The ARCH_SIG_BITOPS functions for
m68k use these instruction types. We should base the use of these functions
(or the generic versions) on the CONFIG_CPU_HAS_NO_BITFIELDS define.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
  • Loading branch information
Greg Ungerer committed Jul 25, 2011
1 parent 7c94619 commit f3c23a2
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions arch/m68k/include/asm/signal.h
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ typedef struct sigaltstack {
#ifdef __KERNEL__
#include <asm/sigcontext.h>

#ifndef __uClinux__
#ifndef CONFIG_CPU_HAS_NO_BITFIELDS
#define __HAVE_ARCH_SIG_BITOPS

static inline void sigaddset(sigset_t *set, int _sig)
Expand Down Expand Up @@ -199,15 +199,14 @@ static inline int sigfindinword(unsigned long word)
return word ^ 31;
}

struct pt_regs;
extern void ptrace_signal_deliver(struct pt_regs *regs, void *cookie);
#endif /* !CONFIG_CPU_HAS_NO_BITFIELDS */

#else

#undef __HAVE_ARCH_SIG_BITOPS
#ifdef __uClinux__
#define ptrace_signal_deliver(regs, cookie) do { } while (0)

#else
struct pt_regs;
extern void ptrace_signal_deliver(struct pt_regs *regs, void *cookie);
#endif /* __uClinux__ */
#endif /* __KERNEL__ */

#endif /* __KERNEL__ */
#endif /* _M68K_SIGNAL_H */

0 comments on commit f3c23a2

Please sign in to comment.