diff options
Diffstat (limited to 'kernel/kmod.c')
-rw-r--r-- | kernel/kmod.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/kernel/kmod.c b/kernel/kmod.c index 9ab513bd0c3c..5ae0ff38425f 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c | |||
@@ -245,7 +245,6 @@ static void __call_usermodehelper(struct work_struct *work) | |||
245 | } | 245 | } |
246 | } | 246 | } |
247 | 247 | ||
248 | #ifdef CONFIG_PM_SLEEP | ||
249 | /* | 248 | /* |
250 | * If set, call_usermodehelper_exec() will exit immediately returning -EBUSY | 249 | * If set, call_usermodehelper_exec() will exit immediately returning -EBUSY |
251 | * (used for preventing user land processes from being created after the user | 250 | * (used for preventing user land processes from being created after the user |
@@ -321,12 +320,6 @@ static void helper_unlock(void) | |||
321 | if (atomic_dec_and_test(&running_helpers)) | 320 | if (atomic_dec_and_test(&running_helpers)) |
322 | wake_up(&running_helpers_waitq); | 321 | wake_up(&running_helpers_waitq); |
323 | } | 322 | } |
324 | #else /* CONFIG_PM_SLEEP */ | ||
325 | #define usermodehelper_disabled 0 | ||
326 | |||
327 | static inline void helper_lock(void) {} | ||
328 | static inline void helper_unlock(void) {} | ||
329 | #endif /* CONFIG_PM_SLEEP */ | ||
330 | 323 | ||
331 | /** | 324 | /** |
332 | * call_usermodehelper_setup - prepare to call a usermode helper | 325 | * call_usermodehelper_setup - prepare to call a usermode helper |