Re: Bug: duplicate marker entry in Modules.marker

[Roland McGrath <roland at redhat dot com>]

If marker names are unique, then it's easy to deal with.  When I was doing
the modpost hack, I think I recall seeing something with an overloaded name
used with two different formats.  I thought it was nutty, but that it
appeared to be the plan.  So I made modpost only look for duplicates of the
whole "name module format" line.

Come to think of it, maybe it's easy to deal with another way anyhow.
All the lines from the old file that use the module name we are processing
now should be replaced, right?  What about this?


Thanks,
Roland

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 695b5d6..e23147b 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1973,7 +1973,8 @@ static void read_markers(const char *fname)
 			mod->skip = 1;
 		}
 
-		add_marker(mod, marker, fmt);
+		if (!mod->skip)
+			add_marker(mod, marker, fmt);
 	}
 	return;
 fail: