aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds2015-07-01 12:49:25 -0500
committerLinus Torvalds2015-07-01 12:49:25 -0500
commit02201e3f1b46aed7c6348f406b7b40de80ba6de3 (patch)
tree2392c9098359725c195dd82a72b20ccedc1a1509 /drivers/input/mouse
parent0890a264794f33df540fbaf274699146903b4e6b (diff)
parent20bdc2cfdbc484777b30b96fcdbb8994038f3ce1 (diff)
downloadkernel-omap-02201e3f1b46aed7c6348f406b7b40de80ba6de3.tar.gz
kernel-omap-02201e3f1b46aed7c6348f406b7b40de80ba6de3.tar.xz
kernel-omap-02201e3f1b46aed7c6348f406b7b40de80ba6de3.zip
Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull module updates from Rusty Russell: "Main excitement here is Peter Zijlstra's lockless rbtree optimization to speed module address lookup. He found some abusers of the module lock doing that too. A little bit of parameter work here too; including Dan Streetman's breaking up the big param mutex so writing a parameter can load another module (yeah, really). Unfortunately that broke the usual suspects, !CONFIG_MODULES and !CONFIG_SYSFS, so those fixes were appended too" * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (26 commits) modules: only use mod->param_lock if CONFIG_MODULES param: fix module param locks when !CONFIG_SYSFS. rcu: merge fix for Convert ACCESS_ONCE() to READ_ONCE() and WRITE_ONCE() module: add per-module param_lock module: make perm const params: suppress unused variable error, warn once just in case code changes. modules: clarify CONFIG_MODULE_COMPRESS help, suggest 'N'. kernel/module.c: avoid ifdefs for sig_enforce declaration kernel/workqueue.c: remove ifdefs over wq_power_efficient kernel/params.c: export param_ops_bool_enable_only kernel/params.c: generalize bool_enable_only kernel/module.c: use generic module param operaters for sig_enforce kernel/params: constify struct kernel_param_ops uses sysfs: tightened sysfs permission checks module: Rework module_addr_{min,max} module: Use __module_address() for module_address_lookup() module: Make the mod_tree stuff conditional on PERF_EVENTS || TRACING module: Optimize __module_address() using a latched RB-tree rbtree: Implement generic latch_tree seqlock: Introduce raw_read_seqcount_latch() ...
Diffstat (limited to 'drivers/input/mouse')
-rw-r--r--drivers/input/mouse/psmouse-base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 7c4ba43d253e..ec3477036150 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -47,7 +47,7 @@ MODULE_LICENSE("GPL");
47static unsigned int psmouse_max_proto = PSMOUSE_AUTO; 47static unsigned int psmouse_max_proto = PSMOUSE_AUTO;
48static int psmouse_set_maxproto(const char *val, const struct kernel_param *); 48static int psmouse_set_maxproto(const char *val, const struct kernel_param *);
49static int psmouse_get_maxproto(char *buffer, const struct kernel_param *kp); 49static int psmouse_get_maxproto(char *buffer, const struct kernel_param *kp);
50static struct kernel_param_ops param_ops_proto_abbrev = { 50static const struct kernel_param_ops param_ops_proto_abbrev = {
51 .set = psmouse_set_maxproto, 51 .set = psmouse_set_maxproto,
52 .get = psmouse_get_maxproto, 52 .get = psmouse_get_maxproto,
53}; 53};