Tue May 19 21:57:25 2020 UTC ()
Remove duplicate def of tsc_get_timecount().


(ad)
diff -r1.24 -r1.25 src/sys/arch/xen/xen/xen_machdep.c
cvs diff -r1.24 -r1.25 src/sys/arch/xen/xen/xen_machdep.c (expand / switch to unified diff)

--- src/sys/arch/xen/xen/xen_machdep.c 2020/05/02 16:44:36 1.24
+++ src/sys/arch/xen/xen/xen_machdep.c 2020/05/19 21:57:25 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: xen_machdep.c,v 1.24 2020/05/02 16:44:36 bouyer Exp $ */ 1/* $NetBSD: xen_machdep.c,v 1.25 2020/05/19 21:57:25 ad Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2006 Manuel Bouyer. 4 * Copyright (c) 2006 Manuel Bouyer.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 14 *
@@ -43,27 +43,27 @@ @@ -43,27 +43,27 @@
43 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 43 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
44 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 44 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
45 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 45 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
46 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 46 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
47 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 47 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
48 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 48 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
49 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 49 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
50 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 50 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
51 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 51 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
52 */ 52 */
53 53
54 54
55#include <sys/cdefs.h> 55#include <sys/cdefs.h>
56__KERNEL_RCSID(0, "$NetBSD: xen_machdep.c,v 1.24 2020/05/02 16:44:36 bouyer Exp $"); 56__KERNEL_RCSID(0, "$NetBSD: xen_machdep.c,v 1.25 2020/05/19 21:57:25 ad Exp $");
57 57
58#include "opt_xen.h" 58#include "opt_xen.h"
59 59
60#include <sys/param.h> 60#include <sys/param.h>
61#include <sys/systm.h> 61#include <sys/systm.h>
62#include <sys/boot_flag.h> 62#include <sys/boot_flag.h>
63#include <sys/conf.h> 63#include <sys/conf.h>
64#include <sys/disk.h> 64#include <sys/disk.h>
65#include <sys/device.h> 65#include <sys/device.h>
66#include <sys/mount.h> 66#include <sys/mount.h>
67#include <sys/reboot.h> 67#include <sys/reboot.h>
68#include <sys/timetc.h> 68#include <sys/timetc.h>
69#include <sys/sysctl.h> 69#include <sys/sysctl.h>
@@ -217,33 +217,26 @@ xen_parse_cmdline(int what, union xen_cm @@ -217,33 +217,26 @@ xen_parse_cmdline(int what, union xen_cm
217 if (cmd_line) 217 if (cmd_line)
218 *cmd_line++ = ' '; 218 *cmd_line++ = ' ';
219 } 219 }
220} 220}
221 221
222#ifdef XENPV 222#ifdef XENPV
223extern uint64_t tsc_freq; /* XXX */ 223extern uint64_t tsc_freq; /* XXX */
224 224
225static int sysctl_xen_suspend(SYSCTLFN_ARGS); 225static int sysctl_xen_suspend(SYSCTLFN_ARGS);
226static void xen_suspend_domain(void); 226static void xen_suspend_domain(void);
227static void xen_prepare_suspend(void); 227static void xen_prepare_suspend(void);
228static void xen_prepare_resume(void); 228static void xen_prepare_resume(void);
229 229
230u_int 
231tsc_get_timecount(struct timecounter *tc) 
232{ 
233 
234 panic("xen: tsc_get_timecount"); 
235} 
236 
237/* 230/*
238 * this function sets up the machdep.xen.suspend sysctl(7) that 231 * this function sets up the machdep.xen.suspend sysctl(7) that
239 * controls domain suspend/save. 232 * controls domain suspend/save.
240 */ 233 */
241void 234void
242sysctl_xen_suspend_setup(void) 235sysctl_xen_suspend_setup(void)
243{ 236{
244 const struct sysctlnode *node = NULL; 237 const struct sysctlnode *node = NULL;
245 238
246 /* 239 /*
247 * dom0 implements sleep support through ACPI. It should not call 240 * dom0 implements sleep support through ACPI. It should not call
248 * this function to register a suspend interface. 241 * this function to register a suspend interface.
249 */ 242 */