From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Tue, 7 Feb 2017 15:41:25 +0000 (+0100)
Subject: modprobe_small: if only MODPROBE and DEPMOD are selected, no need to test for them
X-Git-Tag: 1_27_0~125
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c2b18583a3df06aeecf535c3cea6856aa1f2e205;p=oweals%2Fbusybox.git

modprobe_small: if only MODPROBE and DEPMOD are selected, no need to test for them

function                                             old     new   delta
modprobe_main                                        321     306     -15

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index d6f481415..431b8aeb2 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -928,7 +928,9 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
 	/* Prevent ugly corner cases with no modules at all */
 	modinfo = xzalloc(sizeof(modinfo[0]));
 
-	if (is_depmod || is_modprobe) {
+	if ((MOD_APPLET_CNT == 2 && ENABLE_DEPMOD && ENABLE_MODPROBE)
+	 || is_depmod || is_modprobe
+	) {
 		/* Goto modules directory */
 		xchdir(CONFIG_DEFAULT_MODULES_DIR);
 		uname(&uts); /* never fails */