m68k: Switch to asm-generic/futex.h

As of commit 00f634bc522dedc8 ("asm-generic: add generic futex for
!CONFIG_SMP") asm-generic follows the m68k futex implementation.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index 9b6c691874bd5d4f309df4a8e5e90b3bc0087bf2..1517ed1c64711028dfa27767d1e5bf0292ebd9d6 100644 (file)
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -6,6 +6,7 @@ generic-y += device.h
 generic-y += emergency-restart.h
 generic-y += errno.h
 generic-y += exec.h
+generic-y += futex.h
 generic-y += hw_irq.h
 generic-y += ioctl.h
 generic-y += ipcbuf.h

diff --git a/arch/m68k/include/asm/futex.h b/arch/m68k/include/asm/futex.h
deleted file mode 100644 (file)
index bc868af..0000000
--- a/arch/m68k/include/asm/futex.h
+++ /dev/null
@@ -1,94 +0,0 @@
-#ifndef _ASM_M68K_FUTEX_H
-#define _ASM_M68K_FUTEX_H
-
-#ifdef __KERNEL__
-#if !defined(CONFIG_MMU)
-#include <asm-generic/futex.h>
-#else  /* CONFIG_MMU */
-
-#include <linux/futex.h>
-#include <linux/uaccess.h>
-#include <asm/errno.h>
-
-static inline int
-futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
-                             u32 oldval, u32 newval)
-{
-       u32 val;
-
-       if (unlikely(get_user(val, uaddr) != 0))
-               return -EFAULT;
-
-       if (val == oldval && unlikely(put_user(newval, uaddr) != 0))
-               return -EFAULT;
-
-       *uval = val;
-
-       return 0;
-}
-
-static inline int
-futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
-{
-       int op = (encoded_op >> 28) & 7;
-       int cmp = (encoded_op >> 24) & 15;
-       int oparg = (encoded_op << 8) >> 20;
-       int cmparg = (encoded_op << 20) >> 20;
-       int oldval, ret;
-       u32 tmp;
-
-       if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))
-               oparg = 1 << oparg;
-
-       pagefault_disable();    /* implies preempt_disable() */
-
-       ret = -EFAULT;
-       if (unlikely(get_user(oldval, uaddr) != 0))
-               goto out_pagefault_enable;
-
-       ret = 0;
-       tmp = oldval;
-
-       switch (op) {
-       case FUTEX_OP_SET:
-               tmp = oparg;
-               break;
-       case FUTEX_OP_ADD:
-               tmp += oparg;
-               break;
-       case FUTEX_OP_OR:
-               tmp |= oparg;
-               break;
-       case FUTEX_OP_ANDN:
-               tmp &= ~oparg;
-               break;
-       case FUTEX_OP_XOR:
-               tmp ^= oparg;
-               break;
-       default:
-               ret = -ENOSYS;
-       }
-
-       if (ret == 0 && unlikely(put_user(tmp, uaddr) != 0))
-               ret = -EFAULT;
-
-out_pagefault_enable:
-       pagefault_enable();     /* subsumes preempt_enable() */
-
-       if (ret == 0) {
-               switch (cmp) {
-               case FUTEX_OP_CMP_EQ: ret = (oldval == cmparg); break;
-               case FUTEX_OP_CMP_NE: ret = (oldval != cmparg); break;
-               case FUTEX_OP_CMP_LT: ret = (oldval < cmparg); break;
-               case FUTEX_OP_CMP_GE: ret = (oldval >= cmparg); break;
-               case FUTEX_OP_CMP_LE: ret = (oldval <= cmparg); break;
-               case FUTEX_OP_CMP_GT: ret = (oldval > cmparg); break;
-               default: ret = -ENOSYS;
-               }
-       }
-       return ret;
-}
-
-#endif /* CONFIG_MMU */
-#endif /* __KERNEL__ */
-#endif /* _ASM_M68K_FUTEX_H */