[PATCH 1/6] depmod: isolate out-of-date check between alts

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Keegan McAllister <keegan@xxxxxxxxxxx>
---
 depmod.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/depmod.c b/depmod.c
index beb65d8..cbb9992 100644
--- a/depmod.c
+++ b/depmod.c
@@ -1470,6 +1470,7 @@ static void do_alternative(struct config_alternative *alt,
 	struct module_overrides *overrides = NULL;
 	int i, opt;
 	char *dirname;
+	int all_modules_here = all_modules;
 
 	clear_symbolhash();
 
@@ -1477,8 +1478,8 @@ static void do_alternative(struct config_alternative *alt,
 
 	if (maybe_all) {
 		if (!doing_stdout && !depfile_out_of_date(dirname))
-			exit(0);
-		all_modules = 1;
+			return;
+		all_modules_here = 1;
 	}
 
 	parse_toplevel_config(alt->config_file, basedir, alt->module_dir,
@@ -1497,7 +1498,7 @@ static void do_alternative(struct config_alternative *alt,
 		search = add_search(dirname, len, search);
 	}
 
-	if (!all_modules) {
+	if (!all_modules_here) {
 		/* Do command line args. */
 		for (opt = optind; opt < argc; opt++) {
 			struct module *new;
-- 
1.7.2.3

--
To unsubscribe from this list: send the line "unsubscribe linux-modules" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux