reduce the scope of things that include uvm_swap_encrypt.h.

uvm_meter.c needs it to route the sysctl, uvm_swap.c needs it to
use the functionality, and uvm_swap_encrypt.c needs it to for obvious
reasons. userland sysctl already includes it explicitely.

everything else doesnt and shouldnt care.

ok miod@

diff --git a/sys/uvm/uvm.h b/sys/uvm/uvm.h
index 8b9d61c..bc42871 100644 (file)
--- a/sys/uvm/uvm.h
+++ b/sys/uvm/uvm.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: uvm.h,v 1.58 2015/04/23 09:56:23 dlg Exp $    */
+/*     $OpenBSD: uvm.h,v 1.59 2015/05/04 10:21:15 dlg Exp $    */
 /*     $NetBSD: uvm.h,v 1.24 2000/11/27 08:40:02 chs Exp $     */
 
 /*
@@ -38,9 +38,6 @@
 #include <uvm/uvm_glue.h>
 #include <uvm/uvm_km.h>
 #include <uvm/uvm_swap.h>
-#ifdef UVM_SWAP_ENCRYPT
-#include <uvm/uvm_swap_encrypt.h>
-#endif
 
 #include <uvm/uvm_pmemrange.h>
 

diff --git a/sys/uvm/uvm_swap.c b/sys/uvm/uvm_swap.c
index c0df4e5..e2fbb7f 100644 (file)
--- a/sys/uvm/uvm_swap.c
+++ b/sys/uvm/uvm_swap.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: uvm_swap.c,v 1.134 2015/01/27 03:17:37 dlg Exp $      */
+/*     $OpenBSD: uvm_swap.c,v 1.135 2015/05/04 10:21:15 dlg Exp $      */
 /*     $NetBSD: uvm_swap.c,v 1.40 2000/11/17 11:39:39 mrg Exp $        */
 
 /*
@@ -61,7 +61,7 @@
 
 #include <uvm/uvm.h>
 #ifdef UVM_SWAP_ENCRYPT
-#include <sys/syslog.h>
+#include <uvm/uvm_swap_encrypt.h>
 #endif
 
 #include <sys/specdev.h>

diff --git a/sys/uvm/uvm_swap_encrypt.c b/sys/uvm/uvm_swap_encrypt.c
index ba3cd29..ae76454 100644 (file)
--- a/sys/uvm/uvm_swap_encrypt.c
+++ b/sys/uvm/uvm_swap_encrypt.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: uvm_swap_encrypt.c,v 1.20 2015/03/14 03:38:53 jsg Exp $       */
+/*     $OpenBSD: uvm_swap_encrypt.c,v 1.21 2015/05/04 10:21:15 dlg Exp $       */
 
 /*
  * Copyright 1999 Niels Provos <provos@citi.umich.edu>
@@ -39,6 +39,7 @@
 #include <crypto/rijndael.h>
 
 #include <uvm/uvm.h>
+#include <uvm/uvm_swap_encrypt.h>
 
 struct swap_key *kcur = NULL;
 rijndael_ctx swap_ctxt;