Module Name: src
Committed By: snj
Date: Wed Jan 3 21:11:37 UTC 2018
Modified Files:
src/sys/kern [netbsd-7-0]: subr_kobj.c
Log Message:
Pull up following revision(s) (requested by pgoyette in ticket #1539):
sys/kern/subr_kobj.c: revision 1.52
Compare names of duplicate symbols properly, so we correctly return
an error status.
Fixes PR kern/45125 with patch supplied by Akinobu Mita
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.50.6.1 src/sys/kern/subr_kobj.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_kobj.c
diff -u src/sys/kern/subr_kobj.c:1.50 src/sys/kern/subr_kobj.c:1.50.6.1
--- src/sys/kern/subr_kobj.c:1.50 Wed Jul 16 13:26:33 2014
+++ src/sys/kern/subr_kobj.c Wed Jan 3 21:11:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_kobj.c,v 1.50 2014/07/16 13:26:33 maxv Exp $ */
+/* $NetBSD: subr_kobj.c,v 1.50.6.1 2018/01/03 21:11:37 snj Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.50 2014/07/16 13:26:33 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.50.6.1 2018/01/03 21:11:37 snj Exp $");
#include "opt_modular.h"
@@ -904,7 +904,7 @@ kobj_checksyms(kobj_t ko, bool undefined
strcmp(name, "__end") == 0 ||
strcmp(name, "__end__") == 0 ||
strncmp(name, "__start_link_set_", 17) == 0 ||
- strncmp(name, "__stop_link_set_", 16)) {
+ strncmp(name, "__stop_link_set_", 16) == 0) {
continue;
}
kobj_error(ko, "global symbol `%s' redefined",
