Merge tag 'ftracetest-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[karo-tx-linux.git] / kernel / sys.c

diff --git a/kernel/sys.c b/kernel/sys.c
index 1eaa2f0b02460b5c2a7670af0d1e058444da9eb5..a8c9f5a7dda68f9afd60449a3f9fe0b7d048a6f1 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -91,6 +91,12 @@
 #ifndef SET_TSC_CTL
 # define SET_TSC_CTL(a)                (-EINVAL)
 #endif
+#ifndef MPX_ENABLE_MANAGEMENT
+# define MPX_ENABLE_MANAGEMENT(a)      (-EINVAL)
+#endif
+#ifndef MPX_DISABLE_MANAGEMENT
+# define MPX_DISABLE_MANAGEMENT(a)     (-EINVAL)
+#endif
 
 /*
  * this is where the system-wide overflow UID and GID are defined, for
@@ -2203,6 +2209,12 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
                        me->mm->def_flags &= ~VM_NOHUGEPAGE;
                up_write(&me->mm->mmap_sem);
                break;
+       case PR_MPX_ENABLE_MANAGEMENT:
+               error = MPX_ENABLE_MANAGEMENT(me);
+               break;
+       case PR_MPX_DISABLE_MANAGEMENT:
+               error = MPX_DISABLE_MANAGEMENT(me);
+               break;
        default:
                error = -EINVAL;
                break;