From b2182d058fe7f39afe9425842defda13a386fec8 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 10 May 2011 21:27:34 +0200 Subject: [PATCH] --- yaml --- r: 245346 b: refs/heads/master c: 13d53f8775c6a00b070a3eef6833795412eb7fcd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/kmod.h | 4 ---- trunk/kernel/kmod.c | 7 ------- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 31bc2fabc72b..88b0699e956e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3b0795c98c08351567464150db66d11e05d7611 +refs/heads/master: 13d53f8775c6a00b070a3eef6833795412eb7fcd diff --git a/trunk/include/linux/kmod.h b/trunk/include/linux/kmod.h index 7f3dbcb78116..310231823852 100644 --- a/trunk/include/linux/kmod.h +++ b/trunk/include/linux/kmod.h @@ -111,12 +111,8 @@ call_usermodehelper(char *path, char **argv, char **envp, enum umh_wait wait) extern void usermodehelper_init(void); -#ifdef CONFIG_PM_SLEEP extern int usermodehelper_disable(void); extern void usermodehelper_enable(void); extern bool usermodehelper_is_disabled(void); -#else -static inline bool usermodehelper_is_disabled(void) { return false; } -#endif #endif /* __LINUX_KMOD_H__ */ diff --git a/trunk/kernel/kmod.c b/trunk/kernel/kmod.c index 9ab513bd0c3c..5ae0ff38425f 100644 --- a/trunk/kernel/kmod.c +++ b/trunk/kernel/kmod.c @@ -245,7 +245,6 @@ static void __call_usermodehelper(struct work_struct *work) } } -#ifdef CONFIG_PM_SLEEP /* * If set, call_usermodehelper_exec() will exit immediately returning -EBUSY * (used for preventing user land processes from being created after the user @@ -321,12 +320,6 @@ static void helper_unlock(void) if (atomic_dec_and_test(&running_helpers)) wake_up(&running_helpers_waitq); } -#else /* CONFIG_PM_SLEEP */ -#define usermodehelper_disabled 0 - -static inline void helper_lock(void) {} -static inline void helper_unlock(void) {} -#endif /* CONFIG_PM_SLEEP */ /** * call_usermodehelper_setup - prepare to call a usermode helper