Source-Changes-HG archive

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

[src/trunk]: src/sys/kern Compare names of duplicate symbols properly, so we ...



details:   https://anonhg.NetBSD.org/src/rev/e3f75eac30db
branches:  trunk
changeset: 815661:e3f75eac30db
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Tue May 31 03:57:04 2016 +0000

description:
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 ef6614d992cb -r e3f75eac30db sys/kern/subr_kobj.c
--- a/sys/kern/subr_kobj.c      Tue May 31 03:52:40 2016 +0000
+++ b/sys/kern/subr_kobj.c      Tue May 31 03:57:04 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_kobj.c,v 1.51 2015/08/24 22:50:32 pooka Exp $     */
+/*     $NetBSD: subr_kobj.c,v 1.52 2016/05/31 03:57:04 pgoyette 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.51 2015/08/24 22:50:32 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.52 2016/05/31 03:57:04 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_modular.h"
@@ -906,7 +906,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