[src/netbsd-9]: src/sys/arch/arm/acpi Pull up following revision(s) (requeste...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bcf8b2043a3b
branches:  netbsd-9
changeset: 462334:bcf8b2043a3b
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Aug 12 17:32:09 2019 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #48):

        sys/arch/arm/acpi/acpi_machdep.c: revision 1.9
        sys/arch/arm/acpi/acpi_machdep.c: revision 1.10

Correct the test for writeable memory.  There aren't any users of this at
this point.

Use same style test as acpi_md_OsWritable

diffstat:

 sys/arch/arm/acpi/acpi_machdep.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 8018225a2df2 -r bcf8b2043a3b sys/arch/arm/acpi/acpi_machdep.c
--- a/sys/arch/arm/acpi/acpi_machdep.c  Mon Aug 12 17:29:46 2019 +0000
+++ b/sys/arch/arm/acpi/acpi_machdep.c  Mon Aug 12 17:32:09 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_machdep.c,v 1.6.6.1 2019/08/04 11:37:56 martin Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.6.6.2 2019/08/12 17:32:09 martin Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include "pci.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.6.6.1 2019/08/04 11:37:56 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.6.6.2 2019/08/12 17:32:09 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -210,7 +210,7 @@
 
        for (; sva < eva; sva += PAGE_SIZE) {
                pte = kvtopte(sva);
-               if ((*pte & (LX_BLKPAG_AF|LX_BLKPAG_AP_RO)) != (LX_BLKPAG_AF|LX_BLKPAG_AP_RO))
+               if ((*pte & (LX_BLKPAG_AF|LX_BLKPAG_AP)) != (LX_BLKPAG_AF|LX_BLKPAG_AP_RO))
                        return FALSE;
        }
 
@@ -231,7 +231,7 @@
 
        for (; sva < eva; sva += PAGE_SIZE) {
                pte = kvtopte(sva);
-               if ((*pte & (LX_BLKPAG_AF|LX_BLKPAG_AP_RW)) != (LX_BLKPAG_AF|LX_BLKPAG_AP_RW))
+               if ((*pte & (LX_BLKPAG_AF|LX_BLKPAG_AP)) != (LX_BLKPAG_AF|LX_BLKPAG_AP_RW))
                        return FALSE;
        }