6613109 support more than 16 mblocks

6620429 MPO should not assume a common address range among all mem nodes

1 files changed, 6 insertions, 2 deletions

diff --git a/usr/src/uts/sun4v/sys/mpo.h b/usr/src/uts/sun4v/sys/mpo.h
index e390b5e483..b7d4421e10 100644
--- a/usr/src/uts/sun4v/sys/mpo.h
+++ b/usr/src/uts/sun4v/sys/mpo.h
@@ -34,12 +34,12 @@
 extern "C" {
 #endif
 
+#include <sys/lgrp.h>
+
 /*
  * mpo.h -  Sun4v MPO common header file
  *
  */
-#define	MPO_MAX_MBLOCKS		16
-#define	MAX_MEM_STRIPES	(MAX_MEM_NODES * MPO_MAX_MBLOCKS)
 
 #define	PROP_LG_CPU_ID	"id"
 #define	PROP_LG_MASK	"address-mask"
@@ -87,6 +87,7 @@ struct mblock_md {
 	mde_cookie_t	node;
 	pfn_t		base_pfn;
 	pfn_t		end_pfn;
+	mnodeset_t	mnode_mask;
 };
 
 /* Structure for memnode information for use by plat_pfn_to_mem_node */
@@ -104,6 +105,9 @@ typedef struct {
 	int exists;	/* set to 1 if mblock has memory in this mnode stripe */
 } mem_stripe_t;
 
+/* These are used when MPO requires preallocated kvseg32 space */
+extern	caddr_t	mpo_heap32_buf;
+extern	size_t	mpo_heap32_bufsz;
 
 #ifdef	__cplusplus
 }