Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / kernel / sys.c

diff --git a/kernel/sys.c b/kernel/sys.c
index ec48396..d605fe5 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -103,12 +103,6 @@
 #ifndef SET_TSC_CTL
 # define SET_TSC_CTL(a)                (-EINVAL)
 #endif
-#ifndef MPX_ENABLE_MANAGEMENT
-# define MPX_ENABLE_MANAGEMENT()       (-EINVAL)
-#endif
-#ifndef MPX_DISABLE_MANAGEMENT
-# define MPX_DISABLE_MANAGEMENT()      (-EINVAL)
-#endif
 #ifndef GET_FP_MODE
 # define GET_FP_MODE(a)                (-EINVAL)
 #endif
@@ -2462,15 +2456,9 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
                up_write(&me->mm->mmap_sem);
                break;
        case PR_MPX_ENABLE_MANAGEMENT:
-               if (arg2 || arg3 || arg4 || arg5)
-                       return -EINVAL;
-               error = MPX_ENABLE_MANAGEMENT();
-               break;
        case PR_MPX_DISABLE_MANAGEMENT:
-               if (arg2 || arg3 || arg4 || arg5)
-                       return -EINVAL;
-               error = MPX_DISABLE_MANAGEMENT();
-               break;
+               /* No longer implemented: */
+               return -EINVAL;
        case PR_SET_FP_MODE:
                error = SET_FP_MODE(me, arg2);
                break;