summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormlarkin <mlarkin@openbsd.org>2018-07-04 01:41:56 +0000
committermlarkin <mlarkin@openbsd.org>2018-07-04 01:41:56 +0000
commitf47353a4438253fc75bdd42bf5a3a21779ee32ce (patch)
tree957f6a227b265f46816df54b68ebeb43e677ba87
parentlist the ports for gre in udp, as per rfc8086 and iana assignments. (diff)
downloadwireguard-openbsd-f47353a4438253fc75bdd42bf5a3a21779ee32ce.tar.xz
wireguard-openbsd-f47353a4438253fc75bdd42bf5a3a21779ee32ce.zip
Clean up some extern definitions and includes in hibernate MD code
-rw-r--r--sys/arch/amd64/amd64/hibernate_machdep.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/arch/amd64/amd64/hibernate_machdep.c b/sys/arch/amd64/amd64/hibernate_machdep.c
index d20c8c02a86..03471ae27ef 100644
--- a/sys/arch/amd64/amd64/hibernate_machdep.c
+++ b/sys/arch/amd64/amd64/hibernate_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hibernate_machdep.c,v 1.43 2018/06/25 22:33:24 kettenis Exp $ */
+/* $OpenBSD: hibernate_machdep.c,v 1.44 2018/07/04 01:41:56 mlarkin Exp $ */
/*
* Copyright (c) 2012 Mike Larkin <mlarkin@openbsd.org>
@@ -33,7 +33,7 @@
#include <machine/biosvar.h>
#include <machine/cpu.h>
-#include <machine/hibernate_var.h>
+#include <machine/hibernate.h>
#include <machine/pte.h>
#include <machine/pmap.h>
@@ -55,8 +55,6 @@
void hibernate_enter_resume_4k_pte(vaddr_t, paddr_t);
void hibernate_enter_resume_2m_pde(vaddr_t, paddr_t);
-extern void hibernate_resume_machdep(void);
-extern void hibernate_flush(void);
extern caddr_t start, end;
extern int mem_cluster_cnt;
extern phys_ram_seg_t mem_clusters[];