Module Name:    src
Committed By:   rin
Date:           Fri Feb 21 13:38:05 UTC 2020

Modified Files:
        src/sys/arch/powerpc/powerpc: vm_machdep.c

Log Message:
When UPAGES > 1, both __HAVE_CPU_UAREA_ROUTINES and PMAP_MAP_POOLPAGE
must be defined in order to allocate physically contiguous memory for
u-area.


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/powerpc/powerpc/vm_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/powerpc/powerpc/vm_machdep.c
diff -u src/sys/arch/powerpc/powerpc/vm_machdep.c:1.100 src/sys/arch/powerpc/powerpc/vm_machdep.c:1.101
--- src/sys/arch/powerpc/powerpc/vm_machdep.c:1.100	Mon Jul  6 05:25:29 2015
+++ src/sys/arch/powerpc/powerpc/vm_machdep.c	Fri Feb 21 13:38:05 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.100 2015/07/06 05:25:29 matt Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.101 2020/02/21 13:38:05 rin Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.100 2015/07/06 05:25:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.101 2020/02/21 13:38:05 rin Exp $");
 
 #include "opt_altivec.h"
 #include "opt_multiprocessor.h"
@@ -310,6 +310,11 @@ vunmapbuf(struct buf *bp, vsize_t len)
 	bp->b_saveaddr = 0;
 }
 
+#if UPAGES > 1 && \
+    (!defined(__HAVE_CPU_UAREA_ROUTINES) || !defined(PMAP_MAP_POOLPAGE))
+#error "We need physically contiguous pages for u-area."
+#endif
+
 #ifdef __HAVE_CPU_UAREA_ROUTINES
 void *
 cpu_uarea_alloc(bool system)

Reply via email to