projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sched: Sanitize irq accounting madness
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
kernel
/
module.c
diff --git
a/kernel/module.c
b/kernel/module.c
index
d24fcf2
..
6716a1f
100644
(file)
--- a/
kernel/module.c
+++ b/
kernel/module.c
@@
-815,9
+815,6
@@
SYSCALL_DEFINE2(delete_module, const char __user *, name_user,
return -EFAULT;
name[MODULE_NAME_LEN-1] = '\0';
return -EFAULT;
name[MODULE_NAME_LEN-1] = '\0';
- if (!(flags & O_NONBLOCK))
- pr_warn("waiting module removal not supported: please upgrade\n");
-
if (mutex_lock_interruptible(&module_mutex) != 0)
return -EINTR;
if (mutex_lock_interruptible(&module_mutex) != 0)
return -EINTR;
@@
-3265,6
+3262,9
@@
static int load_module(struct load_info *info, const char __user *uargs,
dynamic_debug_setup(info->debug, info->num_debug);
dynamic_debug_setup(info->debug, info->num_debug);
+ /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
+ ftrace_module_init(mod);
+
/* Finally it's fully formed, ready to start executing. */
err = complete_formation(mod, info);
if (err)
/* Finally it's fully formed, ready to start executing. */
err = complete_formation(mod, info);
if (err)