Source-Changes-HG archive

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

[src/trunk]: src/sys/netinet Make carp_suppress_preempt global back



details:   https://anonhg.NetBSD.org/src/rev/f69d3fb3626a
branches:  trunk
changeset: 331089:f69d3fb3626a
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Thu Jul 31 02:37:25 2014 +0000

description:
Make carp_suppress_preempt global back

It is still accessed by if_pfsync.c.

This unbreaks the build of i386 kernel.

diffstat:

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

diffs (27 lines):

diff -r 4245f57bf856 -r f69d3fb3626a sys/netinet/ip_carp.c
--- a/sys/netinet/ip_carp.c     Thu Jul 31 02:21:51 2014 +0000
+++ b/sys/netinet/ip_carp.c     Thu Jul 31 02:37:25 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_carp.c,v 1.58 2014/07/31 00:56:23 ozaki-r Exp $     */
+/*     $NetBSD: ip_carp.c,v 1.59 2014/07/31 02:37:25 ozaki-r Exp $     */
 /*     $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $   */
 
 /*
@@ -31,7 +31,7 @@
 #include "opt_mbuftrace.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.58 2014/07/31 00:56:23 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.59 2014/07/31 02:37:25 ozaki-r Exp $");
 
 /*
  * TODO:
@@ -153,7 +153,7 @@
        LIST_HEAD(__carp_mchead, carp_mc_entry) carp_mc_listhead;
 };
 
-static int carp_suppress_preempt = 0;
+int carp_suppress_preempt = 0;
 static int carp_opts[CARPCTL_MAXID] = { 0, 1, 0, 0, 0 };       /* XXX for now */
 
 static percpu_t *carpstat_percpu;



Home | Main Index | Thread Index | Old Index