Merge tag 'v3.12'

Linux 3.12

1 files changed, 12 insertions, 1 deletions

diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index 27d9da3f86ff..c3eb102a9cc8 100644
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -36,7 +36,18 @@ static const char __UNIQUE_ID(name)[]					  \
 
 struct kernel_param;
 
+/*
+ * Flags available for kernel_param_ops
+ *
+ * NOARG - the parameter allows for no argument (foo instead of foo=1)
+ */
+enum {
+        KERNEL_PARAM_FL_NOARG = (1 << 0)
+};
+
 struct kernel_param_ops {
+        /* How the ops should behave */
+        unsigned int flags;
         /* Returns 0, or -errno.  arg is in kp->arg. */
         int (*set)(const char *val, const struct kernel_param *kp);
         /* Returns length written or -errno.  Buffer is 4k (ie. be short!) */
@@ -187,7 +198,7 @@ struct kparam_array
 /* Obsolete - use module_param_cb() */
 #define module_param_call(name, set, get, arg, perm)                    \
         static struct kernel_param_ops __param_ops_##name =             \
-                 { (void *)set, (void *)get };                          \
+                { 0, (void *)set, (void *)get };                        \
         __module_param_call(MODULE_PARAM_PREFIX,                        \
                             name, &__param_ops_##name, arg,             \
                             (perm) + sizeof(__check_old_set_param(set))*0, -1)