artulab
projects / openbsd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e5ba0de)
Do not call uvm_swap_finicrypt_all() a second time in dumpsys().
authormpi <mpi@openbsd.org>
Wed, 21 Oct 2015 07:59:17 +0000 (07:59 +0000)
committermpi <mpi@openbsd.org>
Wed, 21 Oct 2015 07:59:17 +0000 (07:59 +0000)
ok tedu@, deraadt@, miod@

13 files changed:
sys/arch/alpha/alpha/machdep.c patch | blob | history
sys/arch/amd64/amd64/machdep.c patch | blob | history
sys/arch/arm/arm/stubs.c patch | blob | history
sys/arch/aviion/aviion/machdep.c patch | blob | history
sys/arch/hppa/hppa/machdep.c patch | blob | history
sys/arch/hppa64/hppa64/machdep.c patch | blob | history
sys/arch/i386/i386/machdep.c patch | blob | history
sys/arch/luna88k/luna88k/machdep.c patch | blob | history
sys/arch/macppc/macppc/machdep.c patch | blob | history
sys/arch/sh/sh/sh_machdep.c patch | blob | history
sys/arch/sparc/sparc/machdep.c patch | blob | history
sys/arch/sparc64/sparc64/machdep.c patch | blob | history
sys/arch/vax/vax/machdep.c patch | blob | history

diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index a932831..8f38df9 100644 (file)
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.170 2015/07/03 11:36:19 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.171 2015/10/21 07:59:17 mpi Exp $ */
 /* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */
 
 /*-
@@ -1208,10 +1208,6 @@ dumpsys()
        printf("\ndumping to dev %u,%u offset %ld\n", major(dumpdev),
            minor(dumpdev), dumplo);
 
-#ifdef UVM_SWAP_ENCRYPT
-       uvm_swap_finicrypt_all();
-#endif
-
        psize = (*bdevsw[major(dumpdev)].d_psize)(dumpdev);
        printf("dump ");
        if (psize == -1) {
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c
index 10cffbc..c222161 100644 (file)
--- a/sys/arch/amd64/amd64/machdep.c
+++ b/sys/arch/amd64/amd64/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.216 2015/08/30 10:05:09 yasuoka Exp $   */
+/*     $OpenBSD: machdep.c,v 1.217 2015/10/21 07:59:17 mpi Exp $       */
 /*     $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */
 
 /*-
@@ -914,10 +914,6 @@ dumpsys(void)
        printf("\ndumping to dev %u,%u offset %ld\n", major(dumpdev),
            minor(dumpdev), dumplo);
 
-#ifdef UVM_SWAP_ENCRYPT
-       uvm_swap_finicrypt_all();
-#endif
-
        error = (*bdevsw[major(dumpdev)].d_psize)(dumpdev);
        printf("dump ");
        if (error == -1) {
diff --git a/sys/arch/arm/arm/stubs.c b/sys/arch/arm/arm/stubs.c
index 0fb521d..7a99ef0 100644 (file)
--- a/sys/arch/arm/arm/stubs.c
+++ b/sys/arch/arm/arm/stubs.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: stubs.c,v 1.9 2014/11/16 12:30:56 deraadt Exp $       */
+/*     $OpenBSD: stubs.c,v 1.10 2015/10/21 07:59:17 mpi Exp $  */
 /*     $NetBSD: stubs.c,v 1.14 2003/07/15 00:24:42 lukem Exp $ */
 
 /*
@@ -51,7 +51,6 @@
 #include <sys/core.h>
 #include <sys/kcore.h>
 #include <uvm/uvm_extern.h>
-#include <uvm/uvm_swap.h>
 #include <machine/bootconfig.h>
 #include <machine/cpu.h>
 #include <machine/intr.h>
@@ -157,10 +156,6 @@ dumpsys()
        printf("\ndumping to dev %u,%u offset %ld\n", major(dumpdev),
            minor(dumpdev), dumplo);
 
-#ifdef UVM_SWAP_ENCRYPT
-       uvm_swap_finicrypt_all();
-#endif
-
        blkno = dumplo;
        dumpspace = (vaddr_t) memhook;
 
diff --git a/sys/arch/aviion/aviion/machdep.c b/sys/arch/aviion/aviion/machdep.c
index 11086a3..1b71aa4 100644 (file)
--- a/sys/arch/aviion/aviion/machdep.c
+++ b/sys/arch/aviion/aviion/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.74 2015/02/25 17:41:22 miod Exp $       */
+/*     $OpenBSD: machdep.c,v 1.75 2015/10/21 07:59:17 mpi Exp $        */
 /*
  * Copyright (c) 2007 Miodrag Vallat.
  *
@@ -427,10 +427,6 @@ dumpsys()
        printf("\ndumping to dev %u,%u offset %ld\n", maj,
            minor(dumpdev), dumplo);
 
-#ifdef UVM_SWAP_ENCRYPT
-       uvm_swap_finicrypt_all();
-#endif
-
        /* Setup the dump header */
        kseg_p = (kcore_seg_t *)dump_hdr;
        chdr_p = (cpu_kcore_hdr_t *)&dump_hdr[ALIGN(sizeof(*kseg_p))];
diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c
index aaf508e..f468fcf 100644 (file)
--- a/sys/arch/hppa/hppa/machdep.c
+++ b/sys/arch/hppa/hppa/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.241 2015/01/20 19:43:20 kettenis Exp $  */
+/*     $OpenBSD: machdep.c,v 1.242 2015/10/21 07:59:18 mpi Exp $       */
 
 /*
  * Copyright (c) 1999-2003 Michael Shalayeff
@@ -1040,10 +1040,6 @@ dumpsys(void)
        }
        printf("\ndumping to dev %x, offset %ld\n", dumpdev, dumplo);
 
-#ifdef UVM_SWAP_ENCRYPT
-       uvm_swap_finicrypt_all();
-#endif
-
        psize = (*bdevsw[major(dumpdev)].d_psize)(dumpdev);
        printf("dump ");
        if (psize == -1) {
diff --git a/sys/arch/hppa64/hppa64/machdep.c b/sys/arch/hppa64/hppa64/machdep.c
index deda6e9..dd80c38 100644 (file)
--- a/sys/arch/hppa64/hppa64/machdep.c
+++ b/sys/arch/hppa64/hppa64/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.77 2015/01/20 19:43:20 kettenis Exp $   */
+/*     $OpenBSD: machdep.c,v 1.78 2015/10/21 07:59:18 mpi Exp $        */
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -685,10 +685,6 @@ dumpsys(void)
        }
        printf("\ndumping to dev %x, offset %ld\n", dumpdev, dumplo);
 
-#ifdef UVM_SWAP_ENCRYPT
-       uvm_swap_finicrypt_all();
-#endif
-
        psize = (*bdevsw[major(dumpdev)].d_psize)(dumpdev);
        printf("dump ");
        if (psize == -1) {
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 4b8d8b4..11ffb95 100644 (file)
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.575 2015/09/13 12:28:31 kettenis Exp $  */
+/*     $OpenBSD: machdep.c,v 1.576 2015/10/21 07:59:18 mpi Exp $       */
 /*     $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $    */
 
 /*-
@@ -101,7 +101,6 @@
 
 #include <net/if.h>
 #include <uvm/uvm_extern.h>
-#include <uvm/uvm_swap.h>
 
 #include <machine/bus.h>
 
@@ -2802,10 +2801,6 @@ dumpsys()
                return;
        printf("\ndumping to dev %x, offset %ld\n", dumpdev, dumplo);
 
-#ifdef UVM_SWAP_ENCRYPT
-       uvm_swap_finicrypt_all();
-#endif
-
        error = (*bdevsw[major(dumpdev)].d_psize)(dumpdev);
        printf("dump ");
        if (error == -1) {
diff --git a/sys/arch/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c
index edf6f9c..32df516 100644 (file)
--- a/sys/arch/luna88k/luna88k/machdep.c
+++ b/sys/arch/luna88k/luna88k/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.117 2015/05/18 04:06:37 miod Exp $      */
+/*     $OpenBSD: machdep.c,v 1.118 2015/10/21 07:59:18 mpi Exp $       */
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -589,10 +589,6 @@ dumpsys()
        printf("\ndumping to dev %u,%u offset %ld\n", maj,
            minor(dumpdev), dumplo);
 
-#ifdef UVM_SWAP_ENCRYPT
-       uvm_swap_finicrypt_all();
-#endif
-
        /* Setup the dump header */
        kseg_p = (kcore_seg_t *)dump_hdr;
        chdr_p = (cpu_kcore_hdr_t *)&dump_hdr[ALIGN(sizeof(*kseg_p))];
diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c
index 71b0b48..2cd3395 100644 (file)
--- a/sys/arch/macppc/macppc/machdep.c
+++ b/sys/arch/macppc/macppc/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.171 2015/04/08 15:58:25 mpi Exp $       */
+/*     $OpenBSD: machdep.c,v 1.172 2015/10/21 07:59:18 mpi Exp $       */
 /*     $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $   */
 
 /*
@@ -656,10 +656,6 @@ dumpsys()
                return;
        printf("dumping to dev %x, offset %ld\n", dumpdev, dumplo);
 
-#ifdef UVM_SWAP_ENCRYPT
-       uvm_swap_finicrypt_all();
-#endif
-
        error = (*bdevsw[major(dumpdev)].d_psize)(dumpdev);
        if (error == -1) {
                printf("area unavailable\n");
diff --git a/sys/arch/sh/sh/sh_machdep.c b/sys/arch/sh/sh/sh_machdep.c
index 1954aaf..43d59b9 100644 (file)
--- a/sys/arch/sh/sh/sh_machdep.c
+++ b/sys/arch/sh/sh/sh_machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: sh_machdep.c,v 1.40 2015/05/15 23:20:25 deraadt Exp $ */
+/*     $OpenBSD: sh_machdep.c,v 1.41 2015/10/21 07:59:18 mpi Exp $     */
 /*     $NetBSD: sh3_machdep.c,v 1.59 2006/03/04 01:13:36 uwe Exp $     */
 
 /*
@@ -99,7 +99,6 @@
 #include <sys/reboot.h>
 
 #include <uvm/uvm_extern.h>
-#include <uvm/uvm_swap.h>
 
 #include <dev/cons.h>
 
@@ -364,10 +363,6 @@ dumpsys()
 
        printf("\ndumping to dev 0x%x offset %ld\n", dumpdev, dumplo);
 
-#ifdef UVM_SWAP_ENCRYPT
-       uvm_swap_finicrypt_all();
-#endif
-
        printf("dump ");
 
        /* Write dump header */
diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index ab4458f..9d663ab 100644 (file)
--- a/sys/arch/sparc/sparc/machdep.c
+++ b/sys/arch/sparc/sparc/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.174 2015/09/18 12:50:28 miod Exp $      */
+/*     $OpenBSD: machdep.c,v 1.175 2015/10/21 07:59:18 mpi Exp $       */
 /*     $NetBSD: machdep.c,v 1.85 1997/09/12 08:55:02 pk Exp $ */
 
 /*
@@ -675,10 +675,6 @@ dumpsys()
        printf("\ndumping to dev(%d,%d), at offset %ld blocks\n",
            major(dumpdev), minor(dumpdev), dumplo);
 
-#ifdef UVM_SWAP_ENCRYPT
-       uvm_swap_finicrypt_all();
-#endif
-
        psize = (*bdevsw[major(dumpdev)].d_psize)(dumpdev);
        printf("dump ");
        if (psize == -1) {
diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c
index ee74334..49fc4b8 100644 (file)
--- a/sys/arch/sparc64/sparc64/machdep.c
+++ b/sys/arch/sparc64/sparc64/machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: machdep.c,v 1.173 2015/09/08 10:24:26 deraadt Exp $   */
+/*     $OpenBSD: machdep.c,v 1.174 2015/10/21 07:59:18 mpi Exp $       */
 /*     $NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */
 
 /*-
@@ -786,10 +786,6 @@ dumpsys()
        printf("\ndumping to dev %u,%u offset %ld\n", major(dumpdev),
            minor(dumpdev), dumplo);
 
-#ifdef UVM_SWAP_ENCRYPT
-       uvm_swap_finicrypt_all();
-#endif
-
        psize = (*bdevsw[major(dumpdev)].d_psize)(dumpdev);
        printf("dump ");
        if (psize == -1) {
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index b334da6..2cea065 100644 (file)
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.149 2015/05/13 08:01:21 mpi Exp $ */
+/* $OpenBSD: machdep.c,v 1.150 2015/10/21 07:59:18 mpi Exp $ */
 /* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $         */
 
 /*
@@ -628,10 +628,6 @@ dumpsys()
        printf("\ndumping to dev %u,%u offset %ld\n", major(dumpdev),
            minor(dumpdev), dumplo);
 
-#ifdef UVM_SWAP_ENCRYPT
-       uvm_swap_finicrypt_all();
-#endif
-
        /* Setup the dump header */
        kseg_p = (kcore_seg_t *)dump_hdr;
        chdr_p = (cpu_kcore_hdr_t *)&dump_hdr[ALIGN(sizeof(*kseg_p))];
OpenBSD src
by Ahmet Artu Yildirim