Author: jhibbits
Date: Wed May 27 01:35:46 2020
New Revision: 361545
URL: https://svnweb.freebsd.org/changeset/base/361545
Log:
Properly sort ifdef archs in vm_fault_soft_fast superpage guards.
Sort broken in r360887.
Modified:
head/sys/vm/vm_fault.c
Modified: head/sys/vm/vm_fault.c
==============================================================================
--- head/sys/vm/vm_fault.c Wed May 27 01:24:12 2020 (r361544)
+++ head/sys/vm/vm_fault.c Wed May 27 01:35:46 2020 (r361545)
@@ -299,9 +299,9 @@ static int
vm_fault_soft_fast(struct faultstate *fs)
{
vm_page_t m, m_map;
-#if (defined(__aarch64__) || defined(__amd64__) || defined(__powerpc64__) ||
(defined(__arm__) && \
- __ARM_ARCH >= 6) || defined(__i386__) || defined(__riscv)) && \
- VM_NRESERVLEVEL > 0
+#if (defined(__aarch64__) || defined(__amd64__) || (defined(__arm__) && \
+ __ARM_ARCH >= 6) || defined(__i386__) || defined(__powerpc64__) || \
+ defined(__riscv)) && VM_NRESERVLEVEL > 0
vm_page_t m_super;
int flags;
#endif
@@ -320,9 +320,9 @@ vm_fault_soft_fast(struct faultstate *fs)
}
m_map = m;
psind = 0;
-#if (defined(__aarch64__) || defined(__amd64__) || defined(__powerpc64__) ||
(defined(__arm__) && \
- __ARM_ARCH >= 6) || defined(__i386__) || defined(__riscv)) && \
- VM_NRESERVLEVEL > 0
+#if (defined(__aarch64__) || defined(__amd64__) || (defined(__arm__) && \
+ __ARM_ARCH >= 6) || defined(__i386__) || defined(__powerpc64__) || \
+ defined(__riscv)) && VM_NRESERVLEVEL > 0
if ((m->flags & PG_FICTITIOUS) == 0 &&
(m_super = vm_reserv_to_superpage(m)) != NULL &&
rounddown2(vaddr, pagesizes[m_super->psind]) >= fs->entry->start &&
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
