Module Name: src
Committed By: matt
Date: Sat Jul 28 02:08:51 UTC 2012
Modified Files:
src/sys/arch/xen/include: shutdown_xenbus.h
src/sys/arch/xen/xen: xen_machdep.c
Log Message:
Fix some -fno-common fallout.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/xen/include/shutdown_xenbus.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/xen/xen/xen_machdep.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/arch/xen/include/shutdown_xenbus.h
diff -u src/sys/arch/xen/include/shutdown_xenbus.h:1.4 src/sys/arch/xen/include/shutdown_xenbus.h:1.5
--- src/sys/arch/xen/include/shutdown_xenbus.h:1.4 Tue Sep 20 00:12:24 2011
+++ src/sys/arch/xen/include/shutdown_xenbus.h Sat Jul 28 02:08:50 2012
@@ -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);
Index: src/sys/arch/xen/xen/xen_machdep.c
diff -u src/sys/arch/xen/xen/xen_machdep.c:1.12 src/sys/arch/xen/xen/xen_machdep.c:1.13
--- src/sys/arch/xen/xen/xen_machdep.c:1.12 Sun Jul 22 19:30:19 2012
+++ src/sys/arch/xen/xen/xen_machdep.c Sat Jul 28 02:08:51 2012
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: xen_machdep.
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);
