Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

m68k: use CPU_HAS_NO_BITFIELDS for signal functions

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>

+7 -8
+7 -8
arch/m68k/include/asm/signal.h
··· 150 150 #ifdef __KERNEL__ 151 151 #include <asm/sigcontext.h> 152 152 153 - #ifndef __uClinux__ 153 + #ifndef CONFIG_CPU_HAS_NO_BITFIELDS 154 154 #define __HAVE_ARCH_SIG_BITOPS 155 155 156 156 static inline void sigaddset(sigset_t *set, int _sig) ··· 199 199 return word ^ 31; 200 200 } 201 201 202 + #endif /* !CONFIG_CPU_HAS_NO_BITFIELDS */ 203 + 204 + #ifdef __uClinux__ 205 + #define ptrace_signal_deliver(regs, cookie) do { } while (0) 206 + #else 202 207 struct pt_regs; 203 208 extern void ptrace_signal_deliver(struct pt_regs *regs, void *cookie); 204 - 205 - #else 206 - 207 - #undef __HAVE_ARCH_SIG_BITOPS 208 - #define ptrace_signal_deliver(regs, cookie) do { } while (0) 209 - 210 209 #endif /* __uClinux__ */ 211 - #endif /* __KERNEL__ */ 212 210 211 + #endif /* __KERNEL__ */ 213 212 #endif /* _M68K_SIGNAL_H */