Merge tag 'v3.10.108' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / kernel / kmod.c

diff --git a/kernel/kmod.c b/kernel/kmod.c
index 8241906c4b61a0887304f6524516563707d1a876..09d9df4e32fe2c25fcdc52bbb4dca6049f576279 100644 (file)
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -458,6 +458,7 @@ void __usermodehelper_set_disable_depth(enum umh_disable_depth depth)
        wake_up(&usermodehelper_disabled_waitq);
        up_write(&umhelper_sem);
 }
+EXPORT_SYMBOL_GPL(__usermodehelper_set_disable_depth);
 
 /**
  * __usermodehelper_disable - Prevent new helpers from being started.
@@ -491,6 +492,7 @@ int __usermodehelper_disable(enum umh_disable_depth depth)
        __usermodehelper_set_disable_depth(UMH_ENABLED);
        return -EAGAIN;
 }
+EXPORT_SYMBOL_GPL(__usermodehelper_disable);
 
 static void helper_lock(void)
 {
@@ -578,6 +580,7 @@ int call_usermodehelper_exec(struct subprocess_info *sub_info, int wait)
                goto out;
 
        if (!khelper_wq || usermodehelper_disabled) {
+        pr_warn("[%s] retval(%d), usermodehelper_disabled(%d)\n", __func__, retval, usermodehelper_disabled);
                retval = -EBUSY;
                goto out;
        }