summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@nvidia.com>2014-05-14 20:34:32 -0700
committerMandar Padmawar <mpadmawar@nvidia.com>2014-05-22 04:02:12 -0700
commit9fe6e9a71fc46d26303cff000f91ec528f780b70 (patch)
tree4a8f868a5fd96c05b3fcc056fa4834bb1fb8fdf2 /kernel
parent2807cf8c4216cc0270a988024e954ee9f7fc828f (diff)
fixup! net: ipv6: Add IPv6 support to the ping socket.
During the integration of this change to 3.10, this error check was commented out. Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com> Change-Id: I7e2fa114b0efbe58134f7acc60ec4d18b1bbee0e Reviewed-on: http://git-master/r/409994 Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/module.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/module.c b/kernel/module.c
index 2b741ae39ab9..3b5a5d63fcff 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2704,7 +2704,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
} else if (!same_magic(modmagic, vermagic, info->index.vers)) {
printk(KERN_ERR "%s: version magic '%s' should be '%s'\n",
mod->name, modmagic, vermagic);
- //return -ENOEXEC;
+ return -ENOEXEC;
}
if (!get_modinfo(info, "intree"))