Source-Changes-HG archive

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

[src/netbsd-7-1]: src/sys/kern Pull up following revision(s) (requested by pg...



details:   https://anonhg.NetBSD.org/src/rev/ef215eb4b777
branches:  netbsd-7-1
changeset: 800833:ef215eb4b777
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Jan 03 21:11:38 2018 +0000

description:
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

diffstat:

 sys/kern/subr_kobj.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 86c37d5e37ff -r ef215eb4b777 sys/kern/subr_kobj.c
--- a/sys/kern/subr_kobj.c      Wed Jan 03 20:50:43 2018 +0000
+++ b/sys/kern/subr_kobj.c      Wed Jan 03 21:11:38 2018 +0000
@@ -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.10.1 2018/01/03 21:11:38 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.10.1 2018/01/03 21:11:38 snj Exp $");
 
 #include "opt_modular.h"
 
@@ -904,7 +904,7 @@
                    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",



Home | Main Index | Thread Index | Old Index