Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/xen Fix some -fno-common fallout.



details:   https://anonhg.NetBSD.org/src/rev/071a37d82ce7
branches:  trunk
changeset: 780530:071a37d82ce7
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Jul 28 02:08:50 2012 +0000

description:
Fix some -fno-common fallout.

diffstat:

 sys/arch/xen/include/shutdown_xenbus.h |  4 ++--
 sys/arch/xen/xen/xen_machdep.c         |  8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs (47 lines):

diff -r 915b07b2bcbc -r 071a37d82ce7 sys/arch/xen/include/shutdown_xenbus.h
--- a/sys/arch/xen/include/shutdown_xenbus.h    Sat Jul 28 00:57:04 2012 +0000
+++ b/sys/arch/xen/include/shutdown_xenbus.h    Sat Jul 28 02:08:50 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: shutdown_xenbus.h,v 1.4 2011/09/20 00:12:24 jym Exp $  */
+/*     $NetBSD: shutdown_xenbus.h,v 1.5 2012/07/28 02:08:50 matt Exp $ */
 
 /*-
  * Copyright (c)2006 YAMAMOTO Takashi,
@@ -30,7 +30,7 @@
 #define        _XEN_SHUTDOWN_XENBUS_H_
 
 /* Whether dom0 ordered a suspend (true) or not (false) */
-bool xen_suspend_allow;
+extern bool xen_suspend_allow;
 
 void shutdown_xenbus_setup(void);
 
diff -r 915b07b2bcbc -r 071a37d82ce7 sys/arch/xen/xen/xen_machdep.c
--- a/sys/arch/xen/xen/xen_machdep.c    Sat Jul 28 00:57:04 2012 +0000
+++ b/sys/arch/xen/xen/xen_machdep.c    Sat Jul 28 02:08:50 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xen_machdep.c,v 1.12 2012/07/22 19:30:19 jym Exp $     */
+/*     $NetBSD: xen_machdep.c,v 1.13 2012/07/28 02:08:51 matt Exp $    */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -53,7 +53,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_machdep.c,v 1.12 2012/07/22 19:30:19 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_machdep.c,v 1.13 2012/07/28 02:08:51 matt Exp $");
 
 #include "opt_xen.h"
 
@@ -76,7 +76,9 @@
 
 u_int  tsc_get_timecount(struct timecounter *);
 
-uint64_t tsc_freq;     /* XXX */
+bool xen_suspend_allow;
+
+extern uint64_t tsc_freq;      /* XXX */
 
 static int sysctl_xen_suspend(SYSCTLFN_ARGS);
 static void xen_suspend_domain(void);



Home | Main Index | Thread Index | Old Index