summaryrefslogtreecommitdiff
path: root/include/linux/moduleparam.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2014-09-04 03:01:36 +0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-09-04 03:01:36 +0400
commit516d5f8b04ce2bcd24f03323fc743ae25b81373d (patch)
treeff37e84692dbef5063bbf22672eb8bfad0f25dd8 /include/linux/moduleparam.h
parent6ba694560caeb3531dbedd5b3a37af037ef2a833 (diff)
parent69e273c0b0a3c337a521d083374c918dc52c666f (diff)
downloadlinux-516d5f8b04ce2bcd24f03323fc743ae25b81373d.tar.xz
Merge tag 'v3.17-rc3' into next
Sync with mainline to bring in Chrome EC changes.
Diffstat (limited to 'include/linux/moduleparam.h')
-rw-r--r--include/linux/moduleparam.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index b1990c5524e1..494f99e852da 100644
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -381,6 +381,11 @@ extern int param_set_ulong(const char *val, const struct kernel_param *kp);
extern int param_get_ulong(char *buffer, const struct kernel_param *kp);
#define param_check_ulong(name, p) __param_check(name, p, unsigned long)
+extern struct kernel_param_ops param_ops_ullong;
+extern int param_set_ullong(const char *val, const struct kernel_param *kp);
+extern int param_get_ullong(char *buffer, const struct kernel_param *kp);
+#define param_check_ullong(name, p) __param_check(name, p, unsigned long long)
+
extern struct kernel_param_ops param_ops_charp;
extern int param_set_charp(const char *val, const struct kernel_param *kp);
extern int param_get_charp(char *buffer, const struct kernel_param *kp);